add hosts gateway entry for red static

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

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 2d3be648084f253b90f6e5ca912bb89d1b7722bd..e1a49d28e231634bd992b74dd975267b709e2328 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
@@ -65,13 +64,16 @@ case "$1" in
                ;;
 
        stop)
-               boot_mesg "Stopping Squid Proxy Server..."
-               iptables -t nat -F SQUID
-               squid -k shutdown >/dev/null 2>&1
-               evaluate_retval
-               killproc /usr/bin/squidGuard >/dev/null
-               killproc /usr/sbin/updxlrator >/dev/null
-               killproc /usr/sbin/squid >/dev/null
+                       iptables -t nat -F SQUID
+               if [ -e /var/run/squid.pid ]; then
+                       boot_mesg "Stopping Squid Proxy Server..."
+                       squid -k shutdown >/dev/null 2>&1
+                       evaluate_retval
+                       killproc /usr/bin/squidGuard >/dev/null
+                       killproc /usr/sbin/updxlrator >/dev/null
+                       killproc /usr/sbin/squid >/dev/null
+                       rm -rf /var/run/squid.pid       
+               fi
                ;;
 
        restart)