From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 9 Oct 2017 13:58:26 +0000 (+0100)
Subject: core115: Regenerate IPsec configuration
X-Git-Tag: v2.19-core115~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8e03c7c53ba59acf4aed8dca38d23a88f2167c9;p=people%2Fpmueller%2Fipfire-2.x.git

core115: Regenerate IPsec configuration

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

diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files
index 5431a9b7e2..75001c237a 100644
--- a/config/rootfiles/core/115/filelists/files
+++ b/config/rootfiles/core/115/filelists/files
@@ -7,6 +7,7 @@ srv/web/ipfire/cgi-bin/captive/logo.cgi
 srv/web/ipfire/cgi-bin/captive/redirect.cgi
 srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/captive
 usr/bin/captive-cleanup
 usr/local/bin/backupiso
diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index 70e7bd919f..1b91da1872 100644
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -62,6 +62,12 @@ fcrontab -z
 /etc/rc.d/init.d/apache2 reload
 /etc/rc.d/init.d/firewall restart
 
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec restart
+fi
+
 # This update need a reboot...
 #touch /var/run/need_reboot