Mailing List Archive

Author: ingvar
Date: 2008-09-16 14:25:46 +0200 (Tue, 16 Sep 2008)
New Revision: 3192

Modified:
trunk/varnish-cache/redhat/varnish.initrc
trunk/varnish-cache/redhat/varnish.spec
trunk/varnish-cache/redhat/varnishlog.initrc
trunk/varnish-cache/redhat/varnishncsa.initrc
Log:
Fixed pidfile issues in redhat package


Modified: trunk/varnish-cache/redhat/varnish.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnish.initrc 2008-09-16 11:27:44 UTC (rev 3191)
+++ trunk/varnish-cache/redhat/varnish.initrc 2008-09-16 12:25:46 UTC (rev 3192)
@@ -61,7 +61,7 @@
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 @@

stop() {
echo -n "Stopping varnish HTTP accelerator: "
- killproc $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile

Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec 2008-09-16 11:27:44 UTC (rev 3191)
+++ trunk/varnish-cache/redhat/varnish.spec 2008-09-16 12:25:46 UTC (rev 3192)
@@ -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/

Modified: trunk/varnish-cache/redhat/varnishlog.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnishlog.initrc 2008-09-16 11:27:44 UTC (rev 3191)
+++ trunk/varnish-cache/redhat/varnishlog.initrc 2008-09-16 12:25:46 UTC (rev 3192)
@@ -49,7 +49,7 @@

stop() {
echo -n "Stopping varnish logging daemon: "
- killproc $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile

Modified: trunk/varnish-cache/redhat/varnishncsa.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnishncsa.initrc 2008-09-16 11:27:44 UTC (rev 3191)
+++ trunk/varnish-cache/redhat/varnishncsa.initrc 2008-09-16 12:25:46 UTC (rev 3192)
@@ -49,7 +49,7 @@

stop() {
echo -n "Stopping varnish ncsa logging daemon: "
- killproc $prog
+ killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile