#9 Add plugin bypass-lan, disabled in default configuration
Merged 5 years ago by mzabaluev. Opened 6 years ago by mzabaluev.
rpms/ mzabaluev/strongswan add-bypass-lan  into  master

file modified
+9 -3
@@ -95,6 +95,7 @@ 

      --bindir=%{_libexecdir}/strongswan \

      --with-ipseclibdir=%{_libdir}/strongswan \

      --with-fips-mode=2 \

+     --enable-bypass-lan \

      --enable-tss-trousers \

      --enable-nm \

      --enable-systemd \
@@ -168,6 +169,11 @@ 

  %endif

      --enable-kernel-libipsec

  

+ # disable certain plugins in the daemon configuration by default

+ for p in bypass-lan; do

+     echo -e "\ncharon.plugins.${p}.load := no" >> conf/plugins/${p}.opt

+ done

+ 

  make %{?_smp_mflags}

  

  %install
@@ -183,12 +189,12 @@ 

  # delete unwanted library files - no consumers, so no -devel package

  rm %{buildroot}%{_libdir}/strongswan/*.so

  # fix config permissions

- chmod 644 %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf

+ chmod 644 %{buildroot}%{_sysconfdir}/strongswan/strongswan.conf

  

  # Create ipsec.d directory tree.

- install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/ipsec.d

+ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d

  for i in aacerts acerts certs cacerts crls ocspcerts private reqs; do

-     install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/ipsec.d/${i}

+     install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/${i}

  done

  

  %post

An improvement over #4, with the plugin disabled in daemon configuration.

An alternative way to add the plugin in a backward compatible way is to disable it by default in runtime configuration. As the same should be done to the farp plugin, teaching the users to tweak configuration is perhaps a more sustainable way to control strongSwan features than using subpackages for each little feature plugin.

3 new commits added

  • Disable bypass-lan by default in daemon configuration
  • Remove unnecessary uses of %{name} macro
  • Revert "Split subpackage bypass-lan"
5 years ago

rebased onto 0ceb4f6

5 years ago

Pull-Request has been merged by mzabaluev

5 years ago