Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 85c1a4311f611a6389710ad064c690a0617f3b39..7944c708ed943f6b7a95ea16df3b7ad9041b7e72 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -57,8 +57,8 @@ case "$1" in
                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)
@@ -106,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}"