www-servers/varnish: Add a variable VARNISHNCSA_LOGFORMAT for conf.d to be able to override default logformat, migrate to /run, wrapp lines

Package-Manager: portage-2.2.8-r1

4 files changed, 27 insertions, 11 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index a1e6be47..67ef15ed 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.70 2014/01/16 18:49:32 blueness Exp $
 
+  27 Feb 2014; Bertrand Jacquin <beber@meleeweb.net> files/varnishd.confd-r1,
+  files/varnishd.initd-r1:
+  www-servers/varnish: Add a variable VARNISHNCSA_LOGFORMAT for conf.d to be
+  able to override default logformat, migrate to /run, wrapp lines
+
 *varnish-3.0.5-r3 (16 Jan 2014)
 
   16 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index a605817b..5e15447e 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,11 +1,11 @@
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnish-3.0.4-automagic.patch 2837 SHA256 b7dbb426522349bdd7c7c825f3dd0bd116bfdf15514546d7f526cc8e006310e2 WHIRLPOOL a6ce7a97df0d256fcb8459a816a13e97cade34bb6b616bf1c919f659fc07e59733d61cbc2a45de9d00db69212414a2a1993361e6e0bb8861c7f451d4587a2665
 AUX varnish-3.0.4-fix-automake-1.13.patch 586 SHA256 d4bc6d5832c8ea22026da3a892bf04cc1c7787c2e99a7f641dcda36b81082f39 WHIRLPOOL f1746a4bf02a85dabe24d0deb89de2e05bcfd470b71fca72b52912b0679d9b4dd4ff51385380a44dcf9a8e4d422ca8c195b189d84bd6cd321323152b976062d1
-AUX varnishd.confd-r1 706 SHA256 4d1b2498c78ce8ae4bfccafb2847598f9aad68fb6fbd521770dd198b7619a647 WHIRLPOOL 4c3b0273b2ee4943bf662bcbec62176eebc2756ffcbf6cd3f7bf646e917402679085e43af383aa6d9633a5730f7d755fb68f0e7d45b3438d5f9a4b1e7d920c69
-AUX varnishd.initd-r1 2046 SHA256 484b9e53523f1509d48fc6253d99e0ae5e7fed61d112274ef0957449e248ac94 WHIRLPOOL 0a9a2fe5857df26c2e3d49696e86570afb9048889072ee65de6112b8ac7a7e6736757cef0098343007bd58fae2055bc438043c2780f47f33f2494864a3b91930
+AUX varnishd.confd-r1 866 SHA256 462f29edb715f547839ecadd8402b6cf05a33faca08c3899ca0e56b750028415 WHIRLPOOL e2ece98465d2aea09dad94c6587513b46f8f84e436a7646942e07137d36c25093d2f674e09124e7af4dcca33f782f4420d02ee6576caa97d126d33a1557b2d61
+AUX varnishd.initd-r1 2106 SHA256 aa3af9f7cadcd894d7f77808226b6f9fffccdaf1c37f814d9a694435cb0527b9 WHIRLPOOL a937ceb6ef86f6d386b4ed123ed9d6a70e6f8753dd77d997ab97dcb14ae7d149542cc3556ba1912e933d997245fa7a18ecc06e79070daf30394e03288c87e1cc
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
 AUX varnishd.service 312 SHA256 b8a69d0049c87565f1f2d819bdaecf2fe3de12e2b14714219235b107602f8afb WHIRLPOOL b7fc4e9f2a66bec20cf024b4cea39b11a16c2768120218f960ff453523084e09081055f7d6b5a8910ce2af6665d860743ccedcf55538a7923ecafeb1a3510ee7
 DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
 EBUILD varnish-3.0.5.ebuild 1975 SHA256 3b76c80bc0c5aedde002a2dd41a90a7519b190db8f98f0bc05e6a15a50d627ec WHIRLPOOL 437337047d3d0719cdb4729d00f296aad0c8db5dc6d244c56c70306ac60a86e407220cbc42872c4e0fa1e9c8e3c5cd5f81cb42ad2a924f4d0e1bb3c8bd5df8c6
-MISC ChangeLog 11023 SHA256 db70028eca91f8bdc6376603c08b0d65b042f063e4b8ea5977b9848e947a015d WHIRLPOOL d4644776de9d1366e4b3ac74dc2db84aa81600b670373a13bfc46fd0636198df88bf3f4cd85ec4b4ae8c3948002df2b9b86cd5ed04fcd29931d8aa35143a3b57
+MISC ChangeLog 11273 SHA256 85819f04579a5f4172bab6ed5f1602f2bbdd8b7f39ea24c6284545aa28d4583a WHIRLPOOL b50186082795ee15ac7b5c51900739133c72b6604d5bc1e52f4f4376596502c91b2500b84360008783977ee3d9ffa83973401e03ec607c8c36b2e3b0a13410f1
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
diff --git a/www-servers/varnish/files/varnishd.confd-r1 b/www-servers/varnish/files/varnishd.confd-r1
index 472b26f9..699bc8e5 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 41e0e302..b3078f38 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
 }