From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 29 Nov 2017 12:40:53 +0000 (+0000)
Subject: core117: Ship updated strongswan
X-Git-Tag: v2.19-core117~1^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3eaba41041460e17780cf5b78309caad687baa25;p=people%2Fstevee%2Fipfire-2.x.git

core117: Ship updated strongswan

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/117/filelists/strongswan b/config/rootfiles/core/117/filelists/strongswan
new file mode 120000
index 0000000000..90c727e265
--- /dev/null
+++ b/config/rootfiles/core/117/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/117/update.sh b/config/rootfiles/core/117/update.sh
index 51f40d99ab..0a6621b39d 100644
--- a/config/rootfiles/core/117/update.sh
+++ b/config/rootfiles/core/117/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+ipsec stop
 
 # Extract files
 extract_files
@@ -50,6 +51,10 @@ chmod 600 \
 # Start services
 /etc/init.d/apache reload
 
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	ipsec start
+fi
+
 # This update need a reboot...
 #touch /var/run/need_reboot