Core Update 166: Ship and restart strongSwan

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/166/filelists/strongswan b/config/rootfiles/core/166/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/166/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index 1370555b06e0d055337fe5319a2c37664f212539..4c1c1e483a1ed97e276811589919e712d7178881 100644 (file)
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -46,6 +46,7 @@ gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
 unset GNUPGHOME
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Extract files
 extract_files
@@ -69,6 +70,9 @@ perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();"
 # Start services
 /etc/init.d/apache restart
 /etc/init.d/sshd restart
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec start
+fi
 
 # This update needs a reboot...
 touch /var/run/need_reboot