cdn/patch/www_varnish_add_name_var_to_rcscripts.patch

   1 --- www/varnish/files/varnishd.in.orig  2013-03-17 05:27:58.000000000 +0000
   2 +++ www/varnish/files/varnishd.in       2013-03-17 05:29:25.000000000 +0000
   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: "-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: "-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 @@ -69,9 +72,9 @@
  19  : ${varnishd_user:="www"}
  20  : ${varnishd_group:="www"}
  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}"}
  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}"}
  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}"}
  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}"}
  27  fi
  28
  29  # If we leave these set, rc.subr will su to them before starting
  30 --- www/varnish/files/varnishlog.in.orig        2013-03-17 05:30:37.000000000 +0000
  31 +++ www/varnish/files/varnishlog.in     2013-03-17 05:31:22.000000000 +0000
  32 @@ -43,7 +43,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  pidfile=${varnishlog_pidfile}
  40  run_rc_command "$1"
  41 --- www/varnish/files/varnishncsa.in.orig       2015-03-23 11:27:36.000000000 -0500
  42 +++ www/varnish/files/varnishncsa.in    2015-04-03 20:03:09.815688893 -0500
  43 @@ -48,7 +48,7 @@
  44  : ${varnishncsa_pidfile:="/var/run/${name}.pid"}
  45  : ${varnishncsa_file:="/var/log/${name}.log"}
  46  : ${varnishncsa_logformat:=""}
  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  pidfile=${varnishncsa_pidfile}
  51  run_rc_command "$1"