packages: varnish/varnish.init, varnish/varnish.sysconfig - support -p (rep...

[glen]

Author: glen                         Date: Fri Nov 20 12:30:02 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- support -p (repeative) via $VARNISH_PARAMS

---- Files affected:
packages/varnish:
   varnish.init (1.9 -> 1.10) , varnish.sysconfig (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.init
diff -u packages/varnish/varnish.init:1.9 packages/varnish/varnish.init:1.10
--- packages/varnish/varnish.init:1.9	Fri Nov 20 13:23:51 2009
+++ packages/varnish/varnish.init	Fri Nov 20 13:29:57 2009
@@ -49,6 +49,11 @@
 		-s ${VARNISH_STORAGE}
 	"
 
+	# iterate over $VARNISH_OPTS
+	for param in $VARNISH_PARAMS; do
+		DAEMON_OPTS="$DAEMON_OPTS -p $param"
+	done
+
 	msg_starting "Varnish HTTP accelerator"
 	daemon /usr/sbin/varnishd $DAEMON_OPTS $VARNISH_OPTS
 	RETVAL=$?

================================================================
Index: packages/varnish/varnish.sysconfig
diff -u packages/varnish/varnish.sysconfig:1.8 packages/varnish/varnish.sysconfig:1.9
--- packages/varnish/varnish.sysconfig:1.8	Fri Nov 20 13:20:22 2009
+++ packages/varnish/varnish.sysconfig	Fri Nov 20 13:29:57 2009
@@ -48,6 +48,11 @@
 # As it is passed last option to varnishd, it can override the earlier values.
 VARNISH_OPTS=""
 
+# Syntax: param=value [param=value]
+# Set the parameters specified by param to the specified value.
+# See Run-Time Parameters section of varnishd(1) for a list of parameters.
+#VARNISH_PARAMS="cli_timeout=10 thread_pools=4"
+
 # Cache file location
 VARNISH_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.init?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.sysconfig?r1=1.8&r2=1.9&f=u