From owner-svn-ports-all@FreeBSD.ORG Mon Mar 23 16:27:38 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D1829D0; Mon, 23 Mar 2015 16:27:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 780406A2; Mon, 23 Mar 2015 16:27:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NGRcne065929; Mon, 23 Mar 2015 16:27:38 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NGRbEk065923; Mon, 23 Mar 2015 16:27:37 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201503231627.t2NGRbEk065923@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 23 Mar 2015 16:27:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382013 - in head/www: varnish varnish/files varnish4 varnish4/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 16:27:38 -0000 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"