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 a3c351cf1319ca3896014bf458ed9d990d7c3a40..3c7941ea64090c1a84b7d6a1e43a49dee6435ca3 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -4,6 +4,9 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
+chown -R squid:squid /var/log/squid
+chown -R squid:squid /var/log/squidGuard
+
 transparent() {
                DEVICE=$1
                
@@ -44,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
@@ -62,17 +64,21 @@ 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/sbin/squid >/dev/null
-               killproc /usr/bin/squidGuard >/dev/null
+       
+               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
+                       evaluate_retval
+                       killproc /usr/bin/squidGuard >/dev/null
+                       killproc /usr/sbin/updxlrator >/dev/null
+                       killproc /usr/sbin/squid >/dev/null
+               fi
                ;;
 
        restart)
                $0 stop
-               sleep 1
+               sleep 5
                $0 start
                ;;