--- 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:="-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:="-j unix,user=${varnishd_jailuser} ${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} else - : ${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:="-j unix,user=${varnishd_jailuser} ${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"} fi 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="-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}"} 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="-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\"}"} procname="%%PREFIX%%/bin/${name}" command="/usr/sbin/daemon"