core185: Ship squid

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

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

diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index 0a3fae638e5de426c4ca25b15ef503382c30c92d..a24f61692e15a949902d2ef10c48e3757284774a 100644 (file)
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -33,6 +33,7 @@ done
 
 # Stop services
 /etc/init.d/ntp stop
+/etc/init.d/squid stop
 
 # Extract files
 extract_files
@@ -87,7 +88,9 @@ telinit u
 /etc/init.d/suricata restart
 /etc/init.d/unbound restart
 /etc/init.d/ntp start
-
+if [ -f /var/ipfire/proxy/enable ]; then
+       /etc/init.d/squid start
+f
 ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections
 # Check if ovpnconfig exists and is not empty
 if [ -s /var/ipfire/ovpn/ovpnconfig ]; then