Fixed pidfile issues in redhat package

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3192 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc
index def874d229e9a7d4fa5f35ccf4c7bddd85bb67ef..9b53941f41de894120a6ed74ee850c28dc1a7a08 100755 (executable)
--- a/varnish-cache/redhat/varnish.initrc
+++ b/varnish-cache/redhat/varnish.initrc
@@ -61,7 +61,7 @@ start() {
                return 6
        else
                # Varnish always gives output on STDOUT
-               daemon --pidfile $pidfile  $exec "$DAEMON_OPTS" > /dev/null 2>&1
+               daemon --pidfile $pidfile  $exec -P $pidfile "$DAEMON_OPTS" > /dev/null 2>&1
                retval=$?
                if [ $retval -eq 0 ]
                then
@@ -77,7 +77,7 @@ start() {
 
 stop() {
        echo -n "Stopping varnish HTTP accelerator: "
-       killproc $prog
+       killproc -p $pidfile $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile

diff --git a/varnish-cache/redhat/varnish.spec b/varnish-cache/redhat/varnish.spec
index a1dace0dae102f5afd79c2b564e8afd63af3c38a..4e5a1baab40e34edc35e5072142e9aa26fa70e59 100644 (file)
--- a/varnish-cache/redhat/varnish.spec
+++ b/varnish-cache/redhat/varnish.spec
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 2.0
-Release: 0.9.20080912svn3184%{?dist}
+Release: 0.9.20080916svn3192%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/

diff --git a/varnish-cache/redhat/varnishlog.initrc b/varnish-cache/redhat/varnishlog.initrc
index e22be7df5f4f130debf5efaee86070cfd1f03015..54d48d89265d143661e280ab7c8bf29c2c344e7a 100644 (file)
--- a/varnish-cache/redhat/varnishlog.initrc
+++ b/varnish-cache/redhat/varnishlog.initrc
@@ -49,7 +49,7 @@ start() {
 
 stop() {
        echo -n "Stopping varnish logging daemon: "
-       killproc $prog
+       killproc -p $pidfile $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile

diff --git a/varnish-cache/redhat/varnishncsa.initrc b/varnish-cache/redhat/varnishncsa.initrc
index d556f072a346e8732da74d0a87bec24de67fecc5..8efb1890bbdd5becc36f9ff8428a7fd8b7fa9d39 100644 (file)
--- a/varnish-cache/redhat/varnishncsa.initrc
+++ b/varnish-cache/redhat/varnishncsa.initrc
@@ -49,7 +49,7 @@ start() {
 
 stop() {
        echo -n "Stopping varnish ncsa logging daemon: "
-       killproc $prog
+       killproc -p $pidfile $prog
        retval=$?
        echo
        [ $retval -eq 0 ] && rm -f $lockfile