svn commit: r382013 - in head/www: varnish varnish/files varnish4 varnish4/files

[Mark Felder]

Author: feld
Date: Mon Mar 23 16:27:36 2015
New Revision: 382013
URL: https://svnweb.freebsd.org/changeset/ports/382013
QAT: https://qat.redports.org/buildarchive/r382013/

Log:
  Allow configuration of the varnishncsa log format
  
  PR:		198742

Modified:
  head/www/varnish/Makefile
  head/www/varnish/files/varnishncsa.in
  head/www/varnish4/Makefile
  head/www/varnish4/files/varnishncsa.in

Modified: head/www/varnish/Makefile
==============================================================================
--- head/www/varnish/Makefile	Mon Mar 23 16:11:53 2015	(r382012)
+++ head/www/varnish/Makefile	Mon Mar 23 16:27:36 2015	(r382013)
@@ -2,6 +2,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 

Modified: head/www/varnish/files/varnishncsa.in
==============================================================================
--- head/www/varnish/files/varnishncsa.in	Mon Mar 23 16:11:53 2015	(r382012)
+++ head/www/varnish/files/varnishncsa.in	Mon Mar 23 16:27:36 2015	(r382013)
@@ -21,7 +21,11 @@
 #	default: "/var/log/varnishncsa.log"
 #
 # varnishncsa_flags - command line arguments.
-#	default: "-D -P ${varnishncsa_pidfile} -a -c -w ${varnishncsa_file}"
+#	default: "-D -P ${varnishncsa_pidfile} -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
+#
+# varnishncsa_logformat - log file format.
+#       default: "" (uses varnishncsa's default format)
+#       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
 #
 # Add the following line to /etc/newsyslog.conf to rotate the log file
 # once a day:
@@ -43,7 +47,8 @@ load_rc_config ${name}
 : ${varnishncsa_enable:="NO"}
 : ${varnishncsa_pidfile:="/var/run/${name}.pid"}
 : ${varnishncsa_file:="/var/log/${name}.log"}
-: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}"}
+: ${varnishncsa_logformat:=""}
+: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
 
 pidfile=${varnishncsa_pidfile}
 run_rc_command "$1"

Modified: head/www/varnish4/Makefile
==============================================================================
--- head/www/varnish4/Makefile	Mon Mar 23 16:11:53 2015	(r382012)
+++ head/www/varnish4/Makefile	Mon Mar 23 16:27:36 2015	(r382013)
@@ -2,7 +2,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	4.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 PKGNAMESUFFIX=	4

Modified: head/www/varnish4/files/varnishncsa.in
==============================================================================
--- head/www/varnish4/files/varnishncsa.in	Mon Mar 23 16:11:53 2015	(r382012)
+++ head/www/varnish4/files/varnishncsa.in	Mon Mar 23 16:27:36 2015	(r382013)
@@ -21,7 +21,11 @@
 #	default: "/var/log/varnishncsa.log"
 #
 # varnishncsa_flags - command line arguments.
-#	default: "-D -P ${varnishncsa_pidfile} -a -c -w ${varnishncsa_file}"
+#	default: "-D -P ${varnishncsa_pidfile} -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
+#
+# varnishncsa_logformat - log file format.
+#       default: "" (uses varnishncsa's default format)
+#       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
 #
 # Add the following line to /etc/newsyslog.conf to rotate the log file
 # once a day:
@@ -43,7 +47,8 @@ load_rc_config ${name}
 : ${varnishncsa_enable:="NO"}
 : ${varnishncsa_pidfile:="/var/run/${name}.pid"}
 : ${varnishncsa_file:="/var/log/${name}.log"}
-: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}"}
+: ${varnishncsa_logformat:=""}
+: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
 
 pidfile=${varnishncsa_pidfile}
 run_rc_command "$1"