X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=squid.init;h=3a410b7d32b7274fb6e809bffb584556dbcb8029;hb=bb718a7c7eb0961e2c64fa24c684ece130f7b069;hp=bacbad63731bae710054ad6dfb7021f48c6c40f7;hpb=f2f8cc4faa39039487d3eaa6744e8156d96228a8;p=packages%2Fsquid.git

diff --git a/squid.init b/squid.init
index bacbad6..3a410b7 100644
--- 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,58 +54,77 @@ fi
 # Sanity check
 [ -f /etc/squid/squid.conf ] || exit 0
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/squid ]; then
 		msg_starting Squid
-		busy		
 		daemon $SERVICE_RUN_NICE_LEVEL squid $SQUID_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
 	else
 		msg_already_running Squid
-		exit 1
 	fi
 	;;
   stop)
-	# Stop daemons.
 	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 && echo -n "Waiting $DELAY_IN_RESTART seconds..." && sleep $DELAY_IN_RESTART && echo "done."
+	$0 stop
 	$0 start
+	exit $?
 	;;
-  reload)
+  reload|force-reload)
 	if [ -f /var/lock/subsys/squid ]; then
 		msg_reloading Squid
 		busy
 		squid -k reconfigure
-		ok
+		RETVAL=$?
+		[ $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 $?
 	;;
   init)
-	nls "Initializing squid"
+	nls "Initializing %s" squid
 	squid -z
 	;;
   *)
-	msg_usage "$0 {start|stop|init|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|init|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL