Mailing List Archive

Author: des
Date: 2007-05-29 12:54:42 +0200 (Tue, 29 May 2007)
New Revision: 1477

Added:
trunk/varnish-cache/debian/Makefile.am
trunk/varnish-cache/redhat/Makefile.am
Modified:
trunk/varnish-cache/Makefile.am
trunk/varnish-cache/configure.ac
trunk/varnish-cache/debian/
trunk/varnish-cache/redhat/
trunk/varnish-cache/redhat/varnish.initrc
Log:
Be more explicit about which files / directories to include in a release.


Modified: trunk/varnish-cache/Makefile.am
===================================================================
--- trunk/varnish-cache/Makefile.am 2007-05-28 21:04:17 UTC (rev 1476)
+++ trunk/varnish-cache/Makefile.am 2007-05-29 10:54:42 UTC (rev 1477)
@@ -2,4 +2,6 @@

SUBDIRS = include lib bin man etc doc

-EXTRA_DIST = LICENSE autogen.sh debian redhat
+SUBDIRS += debian redhat
+
+EXTRA_DIST = LICENSE autogen.sh

Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2007-05-28 21:04:17 UTC (rev 1476)
+++ trunk/varnish-cache/configure.ac 2007-05-29 10:54:42 UTC (rev 1477)
@@ -140,5 +140,7 @@
lib/libvarnishapi/Makefile
lib/libvcl/Makefile
man/Makefile
+ debian/Makefile
+ redhat/Makefile
])
AC_OUTPUT


Property changes on: trunk/varnish-cache/debian
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile


Added: trunk/varnish-cache/debian/Makefile.am
===================================================================
--- trunk/varnish-cache/debian/Makefile.am (rev 0)
+++ trunk/varnish-cache/debian/Makefile.am 2007-05-29 10:54:42 UTC (rev 1477)
@@ -0,0 +1,7 @@
+# $Id$
+
+EXTRA_DIST = \
+ changelog compat control copyright dirs docs lintian-override \
+ README.Debian rules TODO varnish.default varnish.examples \
+ varnish.init varnish.logrotate varnish.postrm \
+ varnish.varnishlog.init


Property changes on: trunk/varnish-cache/debian/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id


Property changes on: trunk/varnish-cache/redhat
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile


Added: trunk/varnish-cache/redhat/Makefile.am
===================================================================
--- trunk/varnish-cache/redhat/Makefile.am (rev 0)
+++ trunk/varnish-cache/redhat/Makefile.am 2007-05-29 10:54:42 UTC (rev 1477)
@@ -0,0 +1,5 @@
+# $Id$
+
+EXTRA_DIST = \
+ README.redhat TODO varnish.initrc varnishlog.initrc \
+ varnish.logrotate varnish.spec varnish.sysconfig


Property changes on: trunk/varnish-cache/redhat/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id

Modified: trunk/varnish-cache/redhat/varnish.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnish.initrc 2007-05-28 21:04:17 UTC (rev 1476)
+++ trunk/varnish-cache/redhat/varnish.initrc 2007-05-29 10:54:42 UTC (rev 1477)
@@ -38,7 +38,7 @@
echo -n "Please put configuration options in /etc/sysconfig/varnish"
echo_failure
else
- daemon --pidfile ${PIDFILE} ${DAEMON} "$DAEMON_OPTS" -P ${PIDFILE} > /dev/null 2>&1
+ daemon ${DAEMON} "$DAEMON_OPTS" -P ${PIDFILE} > /dev/null 2>&1
sleep 1
pkill -0 $PROCNAME
RETVAL=$?
@@ -54,7 +54,7 @@
;;
stop)
echo -n "Stopping varnish HTTP accelerator: "
- killproc -p $PIDFILE $DAEMON
+ killproc $DAEMON
RETVAL=$?
if [ $RETVAL -eq 0 ]
then
@@ -66,7 +66,7 @@
echo
;;
status)
- status -p $PIDFILE $PROCNAME
+ status $PROCNAME
RETVAL=$?
;;
restart|reload)