cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch

   1 --- www/varnish4/files/varnishd.in      2015-05-27 09:34:42.000000000 -0500
   2 +++ www/varnish4/files/varnishd.in      2015-07-01 16:00:16.999280135 -0500
   3 @@ -43,9 +43,12 @@
   4  # varnishd_group - unprivileged group for the child process.
   5  #      default: "www"
   6  #
   7 +# varnishd_name - name used to construct instance directory.
   8 +#      default: unset
   9 +#
  10  # varnishd_flags - complete command line arguments.
  11 -#      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}"
  12 -#      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}"
  13 +#      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}"
  14 +#      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}"
  15  #
  16  # See varnishd(1) for a detailed overview of command-line options.
  17  #
  18 @@ -71,9 +74,9 @@
  19  pidfile="${varnishd_pidfile}"
  20
  21  if [ -n "${varnishd_config}" ] ; then
  22 -       : ${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}"}
  23 +       : ${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}"}
  24  else
  25 -       : ${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}"}
  26 +       : ${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}"}
  27  fi
  28
  29  # If we leave these set, rc.subr will su to them before starting
  30 --- www/varnish4/files/varnishlog.in    2015-05-27 09:34:42.000000000 -0500
  31 +++ www/varnish4/files/varnishlog.in    2015-07-01 16:00:40.378278329 -0500
  32 @@ -40,7 +40,7 @@
  33  : ${varnishlog_enable:=NO}
  34  : ${varnishlog_pidfile=/var/run/${name}.pid}
  35  : ${varnishlog_file=/var/log/varnish.log}
  36 -: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
  37 +: ${varnishlog_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
  38
  39  command="%%PREFIX%%/bin/${name}"
  40  pidfile=${varnishlog_pidfile}
  41 --- www/varnish4/files/varnishncsa.in   2015-05-27 09:34:42.000000000 -0500
  42 +++ www/varnish4/files/varnishncsa.in   2015-07-01 16:01:02.508547544 -0500
  43 @@ -45,7 +45,7 @@
  44  : ${varnishncsa_enable:=NO}
  45  : ${varnishncsa_pidfile=/var/run/${name}.pid}
  46  : ${varnishncsa_file=/var/log/${name}.log}
  47 -: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
  48 +: ${varnishncsa_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
  49
  50  command="%%PREFIX%%/bin/${name}"
  51  pidfile=${varnishncsa_pidfile}