- pidfile

Changed files:
    varnish.init -> 1.11

diff --git a/varnish.init b/varnish.init
index b2a6c6db9bfda342e44084164765a4f128965fe6..d48ee09ac38ae74ba594b97bd23909944f831fb6 100644 (file)
--- a/varnish.init
+++ b/varnish.init
@@ -27,6 +27,8 @@ else
        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 @@ start() {
                -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 @@ stop() {
        fi
 
        msg_stopping "Varnish HTTP accelerator"
-       killproc /usr/sbin/varnishd
+       killproc --pidfile $PIDFILE /usr/sbin/varnishd
        rm -f /var/lock/subsys/varnish
 }