- added missing dir, release 3

[packages/squid.git] / squid.init

diff --git a/squid.init b/squid.init
index 3ddbef7b9aebb5b1a5e47562913007f5ae1751b5..1028b8669da0928b1f0f2ff9b6e6d98a46419456 100644 (file)
--- a/squid.init
+++ b/squid.init
@@ -7,7 +7,7 @@
 #
 # description: Squid - Internet Object Cache. Internet object caching is \
 #              a way to store requested Internet objects (i.e., data \
-#              available \ via the HTTP, FTP, and gopher protocols) on a \
+#              available via the HTTP, FTP, and gopher protocols) on a \
 #              system closer to the requesting site than to the source. \
 #              Web browsers can then use the local Squid cache as a proxy \
 #              HTTP server, reducing access time as well as bandwidth \
@@ -27,49 +27,68 @@
 [ -f /etc/sysconfig/squid ] && . /etc/sysconfig/squid
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Squid service can't be runed."
+if is_no "${NETWORKING}"; then
+       msg_network_down Squid
        exit 1
 fi
 
 # Sanity check
 [ -f /etc/squid/squid.conf ] || exit 0
 
-
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/squid ]; then
-               show Prepare squid cache
-               busy
-               if [ ! -d $CACHE_SWAP/00 ]; then
-                       squid -z -F &>/dev/null
-               fi
-               deltext;ok
-
-               show Starting squid
-               daemon squid $SQUID_OPTS
+               msg_starting Squid
+               busy            
+               daemon $SERVICE_RUN_NICE_LEVEL squid $SQUID_OPTS
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
        else
-           echo "squid already is running"
+               msg_already_running Squid
        fi
-       touch /var/lock/subsys/squid
        ;;
   stop)
-       show Stopping squid
-       killproc squid  
-       rm -f /var/lock/subsys/squid
+       # Stop daemons.
+       if [ -f /var/lock/subsys/squid ]; then
+               msg_stopping squid
+               killproc squid
+               rm -f /var/lock/subsys/squid >/dev/null 2>&1
+       else
+               msg_not_running squid
+               exit 1
+       fi
        ;;
-  restart|reload)
+  restart)
        $0 stop
+       echo -n "Waiting 30 seconds..."
+       sleep 30
+       echo "done."
        $0 start
        ;;
+  reload)
+       if [ -f /var/lock/subsys/squid ]; then
+               msg_reloading squid
+               busy
+               squid -k reconfigure
+               ok
+       else
+               msg_not_running squid
+               exit 1
+       fi
+       ;;
   status)
        status squid
+       exit $?
+       ;;
+  init)
+       echo "Initializing squid"
+       squid -z
        ;;
   *)
-       echo "Usage: $0 {start|stop|status|restart|reload}"
+       msg_usage "$0 {start|stop|status|restart|reload|init}"
        exit 1
 esac
 
-exit 0
+exit $RETVAL