[gentoo-commits] gentoo-x86 commit in www-servers/varnish/files: varnishd.initd

[Benedikt Boehm (hollow)]

hollow      09/08/30 06:28:07

  Modified:             varnishd.initd
  Log:
  make HTTP_HDR_MAX_VAL configurable in case broken webapps set more than 32 headers; only start varnishncsa logging if desired
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.7                  www-servers/varnish/files/varnishd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?r1=1.6&r2=1.7

Index: varnishd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- varnishd.initd	12 Jul 2009 12:04:06 -0000	1.6
+++ varnishd.initd	30 Aug 2009 06:28:07 -0000	1.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.6 2009/07/12 12:04:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.7 2009/08/30 06:28:07 hollow Exp $
 
 depend() {
 	need net
@@ -13,16 +13,22 @@
 	ulimit -l 82000
 	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/varnishd -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
 	eend $?
-	ebegin "Starting varnish logging"
-	start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
-	eend $?
+
+	if [ "${VARNISHNCSA_ARGS}" != "" ]; then
+		ebegin "Starting varnish logging"
+		start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
+		eend $?
+	fi
 }
 
 stop() {
 	ebegin "Stopping varnish"
 	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
 	eend $?
-	ebegin "Stopping varnish logging"
-	start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
-	eend $?
+
+	if [ -e /var/run/varnishncsa.pid ]; then
+		ebegin "Stopping varnish logging"
+		start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
+		eend $?
+	fi
 }