[patch] conf.d & init.d patch

varnish-logformat.diff (text/plain), 2.71 KB, created by Bertrand Jacquin on 2014-02-27 13:56:50 UTC

diff --git a/www-servers/varnish/files/varnishd.confd-r1 b/www-servers/varnish/files/varnishd.confd-r1
index 472b26f..699bc8e 100644
--- a/www-servers/varnish/files/varnishd.confd-r1
+++ b/www-servers/varnish/files/varnishd.confd-r1
@@ -12,10 +12,14 @@ VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"
 # the config file
 #VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE"
 
-# arguments passed to varnishncsa
-# please see the varnishncsa man page for more options
+# Arguments passed to varnishncsa
+# Please see varnishncsa(1) for more options
 VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"
 
+# Arguments passed to varnishncsa -F option
+# Please see varnishncsa(1) for more options
+# VARNISHNCSA_LOGFORMAT='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"'
+
 # We need to increase the number of open files (-n)
 # and the maximum amount off locked memory (-l)
 # See bug #459142
diff --git a/www-servers/varnish/files/varnishd.initd-r1 b/www-servers/varnish/files/varnishd.initd-r1
index 41e0e30..b3078f3 100755
--- a/www-servers/varnish/files/varnishd.initd-r1
+++ b/www-servers/varnish/files/varnishd.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd-r1,v 1.1 2013/07/08 22:11:35 blueness Exp $
 
@@ -34,24 +34,31 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting varnish"
-	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec ${VARNISHD} -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
+	start-stop-daemon --quiet --start --pidfile /run/varnishd.pid \
+		--exec ${VARNISHD} -- \
+		-P /run/varnishd.pid \
+		${VARNISHD_OPTS} &> /dev/null
 	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}
+		start-stop-daemon --quiet --start --pidfile /run/varnishncsa.pid \
+			--exec /usr/bin/varnishncsa -- \
+			-D -P /run/varnishncsa.pid \
+			${VARNISHNCSA_ARGS} \
+			${VARNISHNCSA_LOGFORMAT:+-F "${VARNISHNCSA_LOGFORMAT}"}
 		eend $?
 	fi
 }
 
 stop() {
 	ebegin "Stopping varnish"
-	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
+	start-stop-daemon --quiet --stop --pidfile /run/varnishd.pid
 	eend $?
 
-	if [ -e /var/run/varnishncsa.pid ]; then
+	if [ -e /run/varnishncsa.pid ]; then
 		ebegin "Stopping varnish logging"
-		start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
+		start-stop-daemon --quiet --stop --pidfile /run/varnishncsa.pid
 		eend $?
 	fi
 }