Merge branch 'kernel-4.14' into next

[ipfire-2.x.git] / config / rootfiles / oldcore / 120 / update.sh

diff --git a/config/rootfiles/oldcore/120/update.sh b/config/rootfiles/oldcore/120/update.sh
index e4ee15b5253efb943c7585c4d31fd2ab149837aa..c465d315b17c7f10bf95bb78e50935edd7148c38 100644 (file)
--- a/config/rootfiles/oldcore/120/update.sh
+++ b/config/rootfiles/oldcore/120/update.sh
@@ -83,15 +83,15 @@ done
 /etc/init.d/apache restart
 /etc/init.d/unbound 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
+
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
-# Remove any pakfire keys stored in /
-rm -rfv /.gnupg
-
-# Move old pakfire keystore into new place
-mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
-
 # Import new Pakfire key
 /etc/init.d/pakfire start