updater: fix ipsec start if it is disabled.

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 44 / update.sh

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index 97416ce47f573b3b263211b6ac12bf0317918de4..10964407b7a9bafc12ab4ae58ddf85baa78cd567 100644 (file)
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -170,14 +170,17 @@ fi
 mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
 grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf
 sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf
+chown nobody:nobody /var/ipfire/vpn/ipsec.conf
 
 #new squid has some changed options. Build a basic config to be able start squid.
 mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org
 grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \
 grep -v "error_directory " | \
+grep -v "cache_dir null" | \
 grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf
 echo >> /var/ipfire/proxy/squid.conf
 echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf
+chown nobody:nobody /var/ipfire/proxy/squid.conf
 
 #Convert extrahd entries to UUID
 cp -f /var/ipfire/extrahd/devices /var/ipfire/extrahd/devices.org
@@ -197,8 +200,9 @@ done < /var/ipfire/extrahd/devices.org
 #
 /etc/init.d/squid start
 /etc/init.d/snort start
-/etc/init.d/ipsec start
-
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
 
 # Add pakfire and fireinfo cronjobs...
 grep -v "# fireinfo" /var/spool/cron/root.orig |