Ended core 5 and started core 6

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / squid

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 8db4f665ff8ceb281325be2327f9946e316a3611..3c7941ea64090c1a84b7d6a1e43a49dee6435ca3 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -47,9 +47,8 @@ transparent() {
 
 case "$1" in
        start)
-               boot_mesg "Starting Squid Proxy Server..."
-               
                if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
+                       boot_mesg "Starting Squid Proxy Server..."
                        loadproc /usr/sbin/squid -D -z >/dev/null 2>&1
                        loadproc /usr/sbin/squid -D
                fi
@@ -66,7 +65,7 @@ case "$1" in
 
        stop)
        
-               if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
+               if [ -e /var/run/squid.pid ]; then
                        boot_mesg "Stopping Squid Proxy Server..."
                        iptables -t nat -F SQUID
                        squid -k shutdown >/dev/null 2>&1