Merge commit 'origin/master' into next

[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 e1a49d28e231634bd992b74dd975267b709e2328..7944c708ed943f6b7a95ea16df3b7ad9041b7e72 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -47,10 +47,18 @@ transparent() {
 
 case "$1" in
        start)
+               getpids "squid"
+
+               if [ -n "${pidlist}" ]; then
+                       echo -e "Squid is already running with Process"\
+                               "ID(s) ${pidlist}.${NORMAL}"
+               evaluate_retval
+               exit
+               fi
                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
+                       loadproc /usr/sbin/squid -z >/dev/null 2>&1
+                       loadproc /usr/sbin/squid
                fi
 
                eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
@@ -82,6 +90,10 @@ case "$1" in
                $0 start
                ;;
 
+       reconfigure)
+       /usr/sbin/squid -k reconfigure
+               ;;
+
        status)
                statusproc /usr/sbin/squid
                statusproc /usr/lib/squid/unlinkd
@@ -94,6 +106,9 @@ case "$1" in
                sleep 1
                $0 start
                ;;
+       setperms)
+               chown -R nobody.squid /var/updatecache/
+               ;;
 
        *)
                echo "Usage: $0 {start|stop|restart|status|flush}"