- findutils are Red by rpm-build; dropped source*-size

[packages/squid.git] / squid.init

diff --git a/squid.init b/squid.init
index 91b477d074871f63c505ea7f654655fa1401eaca..3a410b7d32b7274fb6e809bffb584556dbcb8029 100644 (file)
--- a/squid.init
+++ b/squid.init
@@ -12,6 +12,21 @@
 #              Web browsers can then use the local Squid cache as a proxy \
 #              HTTP server, reducing access time as well as bandwidth \
 #              consumption.
+# description(es): Squid - Cache de Objetos de Internet.  Cache de objetos \
+#              es una manera de almacenar objetos Internet (i.e. Datos \
+#              disponibles vía protocolos HTTP, FTP y gopher) en un \
+#              sistema más próximo al site solicitador que el sistema \
+#              original en internet.  Navegadores www pueden usar el \
+#              cache squid local como un servidor proxy HTTP, reduciendo \
+#              tanto el tiempo de acceso así como el consumo de banda de \
+#              comunicación.
+# description(pt_BR): Squid - Cache de Objetos da Internet. Cache de objetos \
+#              é uma maneira de armazenar objetos Internet (i.e. dados \
+#              disponíveis via protocolos HTTP, FTP e gopher) em um \
+#              sistema mais próximo ao site requisitante do que o sistema \
+#              original na internet. Navegadores www podem usar o cache \
+#              squid local como um servidor proxy HTTP, reduzindo o tempo \
+#              de acesso bem como o consumo de banda de comunicação.
 #
 # pidfile:     /var/run/squid.pid
 # config:      /etc/squid/squid.conf
@@ -28,7 +43,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
                msg_network_down Squid
                exit 1
        fi
@@ -39,7 +54,7 @@ fi
 # Sanity check
 [ -f /etc/squid/squid.conf ] || exit 0
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -51,24 +66,40 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
        else
                msg_already_running Squid
-               exit 1
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/squid ]; then
                # Stop daemons.
                msg_stopping Squid
+               if [ -f /var/run/squid.pid ]; then
+                       PID=$(filter_chroot `cat /var/run/squid.pid`)
+                       if [ -z "$PID" ]; then
+                               PID=0
+                       fi
+               else
+                       PID=0
+               fi
                killproc squid
                RETVAL=$?
+               if [ ! $PID -eq 0 ]; then
+                       show "Waiting for Squid to stop"
+                       busy
+                       while ps -U squid -o user | grep -q ^squid
+                       do
+                               sleep 1
+                       done
+                       ok
+               fi
                rm -f /var/lock/subsys/squid >/dev/null 2>&1
        else
                msg_not_running Squid
-               exit 1
        fi
        ;;
   restart)
-       $0 stop && nls -n "Waiting %s seconds..." "$DELAY_IN_RESTART" && sleep $DELAY_IN_RESTART && nls "done."
+       $0 stop
        $0 start
+       exit $?
        ;;
   reload|force-reload)
        if [ -f /var/lock/subsys/squid ]; then
@@ -76,12 +107,13 @@ case "$1" in
                busy
                squid -k reconfigure
                RETVAL=$?
-               [ $RETVAL -eq 0 ] ok || fail
+               [ $RETVAL -ne 0 ] && RETVAL=7
+               [ $RETVAL -eq 0 ] && ok || fail
        else
-               msg_not_running Squid
-               exit 1
+               msg_not_running Squid >&2
+               exit 7
        fi
-       ;;
+       ;;
   status)
        status squid
        exit $?
@@ -92,7 +124,7 @@ case "$1" in
        ;;
   *)
        msg_usage "$0 {start|stop|init|restart|reload|force-reload|status}"
-       exit 1
+       exit 3
 esac
 
 exit $RETVAL