cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch

   1 --- www/varnish4/files/varnishd.in      2015-11-03 09:08:46.000000000 -0600
   2 +++ www/varnish4/files/varnishd.in      2015-12-01 17:50:00.277112361 -0600
   3 @@ -72,9 +72,9 @@
   4  extra_commands="status reload configtest"
   5
   6  if [ -n "${varnishd_config}" ] ; then
   7 -       : ${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}"}
   8 +       : ${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}"}
   9  else
  10 -       : ${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}"}
  11 +       : ${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}"}
  12  fi
  13
  14  varnishd_checkconfig()
  15 --- www/varnish4/files/varnishlog.in    2015-11-03 09:08:46.000000000 -0600
  16 +++ www/varnish4/files/varnishlog.in    2015-12-01 17:51:05.408224706 -0600
  17 @@ -40,7 +40,7 @@
  18  : ${varnishlog_enable:=NO}
  19  : ${varnishlog_pidfile=/var/run/${name}.pid}
  20  : ${varnishlog_file=/var/log/varnish.log}
  21 -: ${varnishlog_flags="-t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"}
  22 +: ${varnishlog_flags="${varnishd_name:+-n ${varnishd_name}} -t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"}
  23
  24  procname="%%PREFIX%%/bin/${name}"
  25  command="/usr/sbin/daemon"
  26 --- www/varnish4/files/varnishncsa.in   2015-11-03 09:08:46.000000000 -0600
  27 +++ www/varnish4/files/varnishncsa.in   2015-12-01 17:51:09.429151941 -0600
  28 @@ -45,7 +45,7 @@
  29  : ${varnishncsa_enable:=NO}
  30  : ${varnishncsa_pidfile=/var/run/${name}.pid}
  31  : ${varnishncsa_file=/var/log/${name}.log}
  32 -: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"}
  33 +: ${varnishncsa_flags="${varnishd_name:+-n ${varnishd_name}} -t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"}
  34
  35  procname="%%PREFIX%%/bin/${name}"
  36  command="/usr/sbin/daemon"