From 716342b0c3cca46914d0d07adf99bb0564092ba0 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Tue, 1 Dec 2015 17:56:10 -0600 Subject: [PATCH] www/varnish4: update init scripts --- ...w_varnish4_add_name_var_to_rcscripts.patch | 57 +++++++------------ 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch b/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch index f4ef2c2..784713a 100644 --- a/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch +++ b/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch @@ -1,51 +1,36 @@ ---- www/varnish4/files/varnishd.in 2015-05-27 09:34:42.000000000 -0500 -+++ www/varnish4/files/varnishd.in 2015-07-01 16:00:16.999280135 -0500 -@@ -43,9 +43,12 @@ - # varnishd_group - unprivileged group for the child process. - # default: "www" - # -+# varnishd_name - name used to construct instance directory. -+# default: unset -+# - # varnishd_flags - complete command line arguments. --# default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}" --# default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}" -+# default if varnishd_config is unset: "${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}" -+# default if varnishd_config is set: "${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}" - # - # See varnishd(1) for a detailed overview of command-line options. - # -@@ -71,9 +74,9 @@ - pidfile="${varnishd_pidfile}" +--- www/varnish4/files/varnishd.in 2015-11-03 09:08:46.000000000 -0600 ++++ www/varnish4/files/varnishd.in 2015-12-01 17:50:00.277112361 -0600 +@@ -72,9 +72,9 @@ + extra_commands="status reload configtest" if [ -n "${varnishd_config}" ] ; then -- : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"} -+ : ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"} +- : ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} ++ : ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} else -- : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"} -+ : ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"} +- : ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} ++ : ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} fi - # If we leave these set, rc.subr will su to them before starting ---- www/varnish4/files/varnishlog.in 2015-05-27 09:34:42.000000000 -0500 -+++ www/varnish4/files/varnishlog.in 2015-07-01 16:00:40.378278329 -0500 + varnishd_checkconfig() +--- www/varnish4/files/varnishlog.in 2015-11-03 09:08:46.000000000 -0600 ++++ www/varnish4/files/varnishlog.in 2015-12-01 17:51:05.408224706 -0600 @@ -40,7 +40,7 @@ : ${varnishlog_enable:=NO} : ${varnishlog_pidfile=/var/run/${name}.pid} : ${varnishlog_file=/var/log/varnish.log} --: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"} -+: ${varnishlog_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"} +-: ${varnishlog_flags="-t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"} ++: ${varnishlog_flags="${varnishd_name:+-n ${varnishd_name}} -t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"} - command="%%PREFIX%%/bin/${name}" - pidfile=${varnishlog_pidfile} ---- www/varnish4/files/varnishncsa.in 2015-05-27 09:34:42.000000000 -0500 -+++ www/varnish4/files/varnishncsa.in 2015-07-01 16:01:02.508547544 -0500 + procname="%%PREFIX%%/bin/${name}" + command="/usr/sbin/daemon" +--- www/varnish4/files/varnishncsa.in 2015-11-03 09:08:46.000000000 -0600 ++++ www/varnish4/files/varnishncsa.in 2015-12-01 17:51:09.429151941 -0600 @@ -45,7 +45,7 @@ : ${varnishncsa_enable:=NO} : ${varnishncsa_pidfile=/var/run/${name}.pid} : ${varnishncsa_file=/var/log/${name}.log} --: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"} -+: ${varnishncsa_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"} +-: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"} ++: ${varnishncsa_flags="${varnishd_name:+-n ${varnishd_name}} -t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"} - command="%%PREFIX%%/bin/${name}" - pidfile=${varnishncsa_pidfile} + procname="%%PREFIX%%/bin/${name}" + command="/usr/sbin/daemon" -- 2.42.0