Attachment 139337 Details for Bug 185571 – varnish-secretfile-patch-2.txt

varnish-secretfile-patch-2.txt

varnish-secretfile-patch-2.txt (text/plain), 1.64 KB, created by joe on 2014-03-26 23:45:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-03-26 23:45:45 UTC

Size: 1.64 KB

patch

obsolete

>Index: www/varnish/files/varnishd.in
>===================================================================
>--- www/varnish/files/varnishd.in	(revision 348738)
>+++ www/varnish/files/varnishd.in	(working copy)
>@@ -43,6 +43,9 @@
> # varnishd_group - unprivileged group for the child process.
> #	default: "www"
> #
>+# varnishd_secret - secret file used by varnish and related tools.
>+#       default: ""
>+#
> # 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}"
>@@ -68,11 +71,15 @@
> : ${varnishd_hash:="classic,16383"}
> : ${varnishd_user:="www"}
> : ${varnishd_group:="www"}
>+: ${varnishd_secret:=""}
> 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}"}
> 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}"}
> fi
>+if [ -n "${varnishd_secret}" ] ; then
>+        varnishd_flags="${varnishd_flags} -S ${varnishd_secret}"
>+fi
> 
> # If we leave these set, rc.subr will su to them before starting
> # varnishd, which is not what we want.

Actions: View

Attachments on bug 185571: 139336 | 139337