packages: varnish/varnish.init - pidfile

[glen]

Author: glen                         Date: Fri Nov 20 15:12:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pidfile

---- Files affected:
packages/varnish:
   varnish.init (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.init
diff -u packages/varnish/varnish.init:1.10 packages/varnish/varnish.init:1.11
--- packages/varnish/varnish.init:1.10	Fri Nov 20 13:29:57 2009
+++ packages/varnish/varnish.init	Fri Nov 20 16:12:43 2009
@@ -27,6 +27,8 @@
 	exit 0
 fi
 
+PIDFILE=/var/run/varnishd-$INSTANCE.pid
+
 start() {
 	if [ -f /var/lock/subsys/varnish ]; then
 		msg_already_running "Varnish HTTP accelerator"
@@ -47,6 +49,7 @@
 		-w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT}
 		-n ${VARNISH_NAME}
 		-s ${VARNISH_STORAGE}
+		-P ${PIDFILE}
 	"
 
 	# iterate over $VARNISH_OPTS
@@ -67,7 +70,7 @@
 	fi
 
 	msg_stopping "Varnish HTTP accelerator"
-	killproc /usr/sbin/varnishd
+	killproc --pidfile $PIDFILE /usr/sbin/varnishd
 	rm -f /var/lock/subsys/varnish
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.init?r1=1.10&r2=1.11&f=u