Core Update 175: Ship and restart Squid

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/175/filelists/squid b/config/rootfiles/core/175/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/175/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh
index 2c106f69ef9cb1d5b8f187c3f3681951f66f3f4b..f6355e22a09a50378b6f2653b3c263025839a1da 100644 (file)
--- a/config/rootfiles/core/175/update.sh
+++ b/config/rootfiles/core/175/update.sh
@@ -47,6 +47,7 @@ done
 /etc/rc.d/init.d/apache stop
 /etc/rc.d/init.d/ntp stop
 /etc/rc.d/init.d/sshd stop
+/etc/rc.d/init.d/squid stop
 /etc/rc.d/init.d/unbound stop
 /etc/rc.d/init.d/suricata stop
 
@@ -144,6 +145,9 @@ fi
 if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
        /etc/init.d/sshd start
 fi
+if [ -f /var/ipfire/proxy/enable ]; then
+       /etc/init.d/squid start
+fi
 
 # Regenerate all initrds
 dracut --regenerate-all --force