- HTTP_HDR_MAX_VAL 128 instead of 32

[packages/varnish.git] / varnish.init

diff --git a/varnish.init b/varnish.init
index 23f002485cbae60d4974c9d53dabc54771e6aed9..741cdcb70e6fde5831c18fdcfc42167330414e40 100644 (file)
--- a/varnish.init
+++ b/varnish.init
@@ -29,13 +29,19 @@ fi
 
 PIDFILE=/var/run/varnishd.pid
 
+# import some env from parent process
+if [ -f /proc/$PPID/environ ]; then
+       eval $(tr '\0' '\n' < /proc/$PPID/environ | grep -E '^(USER|SUDO_USER|LOGNAME)=')
+       LOGNAME=${SUDO_USER:-${LOGNAME:-$USER}}
+fi
+
 # Generate a label, prefixed with the caller's username, from the
 # kernel random uuid generator, fallback to timestamp
 if [ -f /proc/sys/kernel/random/uuid ]; then
        read uuid < /proc/sys/kernel/random/uuid
-       vcl_label="${LOGNAME}${LOGNAME:+:}${uuid}"
+       vcl_label="$(date +${LOGNAME}${LOGNAME:+:}%Y-%m-%d:%H.%M:${uuid})"
 else
-       vcl_label="$($date +${LOGNAME}${LOGNAME:+:}%s.%N)"
+       vcl_label="$(date +${LOGNAME}${LOGNAME:+:}%s.%N)"
 fi
 
 varnishadm() {