From owner-svn-ports-head@freebsd.org Fri Apr 26 16:53:28 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07A5A15988B8; Fri, 26 Apr 2019 16:53:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9EFFD74716; Fri, 26 Apr 2019 16:53:27 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 753EBE78A; Fri, 26 Apr 2019 16:53:27 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3QGrR9D097403; Fri, 26 Apr 2019 16:53:27 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3QGrQsF097398; Fri, 26 Apr 2019 16:53:26 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201904261653.x3QGrQsF097398@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 26 Apr 2019 16:53:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500118 - in head/www/varnish6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/www/varnish6: . files X-SVN-Commit-Revision: 500118 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9EFFD74716 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2019 16:53:28 -0000 Author: feld Date: Fri Apr 26 16:53:26 2019 New Revision: 500118 URL: https://svnweb.freebsd.org/changeset/ports/500118 Log: www/varnish6: Port improvements - Fix problem when defining multiple cache storage - Add syslog output support for varnishncsa logging Submitted by: iscream@nugae.org Modified: head/www/varnish6/Makefile head/www/varnish6/files/varnishd.in head/www/varnish6/files/varnishncsa.in Modified: head/www/varnish6/Makefile ============================================================================== --- head/www/varnish6/Makefile Fri Apr 26 16:14:44 2019 (r500117) +++ head/www/varnish6/Makefile Fri Apr 26 16:53:26 2019 (r500118) @@ -3,7 +3,7 @@ PORTNAME= varnish PORTVERSION= 6.2.0 DISTVERSIONPREFIX= varnish- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMESUFFIX= 6 Modified: head/www/varnish6/files/varnishd.in ============================================================================== --- head/www/varnish6/files/varnishd.in Fri Apr 26 16:14:44 2019 (r500117) +++ head/www/varnish6/files/varnishd.in Fri Apr 26 16:53:26 2019 (r500118) @@ -83,7 +83,7 @@ varnishd_checkconfig() echo "${name}: nothing to check, no configuration file defined, builtin VCL used" else echo "Performing sanity check on ${name} configuration:" - if eval ${command} -C -f "${varnishd_config}" 2> /dev/null ; then + if eval ${command} ${varnishd_flags} -C -f "${varnishd_config}" 2> /dev/null ; then echo "${name}: the configuration file ${varnishd_config} syntax is ok" else err 1 "${name}: the configuration file ${varnishd_config} syntax is NOT ok" Modified: head/www/varnish6/files/varnishncsa.in ============================================================================== --- head/www/varnish6/files/varnishncsa.in Fri Apr 26 16:14:44 2019 (r500117) +++ head/www/varnish6/files/varnishncsa.in Fri Apr 26 16:53:26 2019 (r500118) @@ -20,8 +20,12 @@ # varnishncsa_file - full path to the log file. # default: "/var/log/varnishncsa.log" # +# varnishncsa_log_method - log to file or syslog +# default: "-D -a -w ${varnishncsa_file}" +# varnishncsa_syslog="YES": '| /usr/bin/logger -t varnish -p daemon.info &' +# # varnishncsa_flags - command line arguments. -# default: "-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}" +# default: "-t off -P ${varnishncsa_pidfile} ${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"} ${varnishncsa_log_method}" # # varnishncsa_logformat - log file format. # default: "" (uses varnishncsa's default format) @@ -45,11 +49,17 @@ load_rc_config ${name} : ${varnishncsa_enable:=NO} : ${varnishncsa_pidfile=/var/run/${name}.pid} : ${varnishncsa_file=/var/log/${name}.log} -: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"} +: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"} +: ${varnishncsa_syslog:=NO} -procname="%%PREFIX%%/bin/${name}" -command="/usr/sbin/daemon" -command_args="-f -u varnishlog ${procname} ${varnishncsa_flags}" +if checkyesno varnishncsa_syslog; then + varnishncsa_log_method='| /usr/bin/logger -t varnish -p daemon.info &' +else + varnishncsa_log_method="-D -a -w ${varnishncsa_file}" +fi + +command="%%PREFIX%%/bin/${name}" +command_args="${varnishncsa_flags} ${varnishncsa_log_method}" pidfile=${varnishncsa_pidfile} start_precmd=precmd