Merge remote-tracking branch 'origin/next' into kernel-4.14

[ipfire-2.x.git] / config / rootfiles / core / 117 / update.sh

diff --git a/config/rootfiles/core/117/update.sh b/config/rootfiles/core/117/update.sh
index a8d83baafcb738d7709b674c9c32b6c24ab7d7a6..88cdf013a7e57b0853861829d9210f4795474d76 100644 (file)
--- 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
@@ -39,10 +40,20 @@ extract_files
 # update linker config
 ldconfig
 
+# Make apache keys not readable for everyone
+chmod 600 \
+       /etc/httpd/server.key \
+       /etc/httpd/server-ecdsa.key
+
 # Update Language cache
-#/usr/local/bin/update-lang-cache
+/usr/local/bin/update-lang-cache
 
 # 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