aboutsummaryrefslogtreecommitdiff
path: root/www/varnish4
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2015-03-23 16:27:36 +0000
committerMark Felder <feld@FreeBSD.org>2015-03-23 16:27:36 +0000
commitc91f0df9a220be1595eecd74efa1e58f21685614 (patch)
treea965d2bb4886f234874d7de1d748ed0030c197bd /www/varnish4
parent47e7958b87124d53ef12cf980e778f9e3734e40e (diff)
downloadports-c91f0df9a220be1595eecd74efa1e58f21685614.tar.gz
ports-c91f0df9a220be1595eecd74efa1e58f21685614.zip
Allow configuration of the varnishncsa log format
PR: 198742
Notes
Notes: svn path=/head/; revision=382013
Diffstat (limited to 'www/varnish4')
-rw-r--r--www/varnish4/Makefile2
-rw-r--r--www/varnish4/files/varnishncsa.in9
2 files changed, 8 insertions, 3 deletions
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index 649841ea79c4..367de0f3d09e 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -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
diff --git a/www/varnish4/files/varnishncsa.in b/www/varnish4/files/varnishncsa.in
index 73950ccc5f16..bb32947cd348 100644
--- a/www/varnish4/files/varnishncsa.in
+++ b/www/varnish4/files/varnishncsa.in
@@ -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"