packages: varnish/reload-vcl - standalone/integrated fixes
glen
glen at pld-linux.org
Thu Jan 7 17:01:39 CET 2010
Author: glen Date: Thu Jan 7 16:01:39 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- standalone/integrated fixes
---- Files affected:
packages/varnish:
reload-vcl (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/varnish/reload-vcl
diff -u packages/varnish/reload-vcl:1.4 packages/varnish/reload-vcl:1.5
--- packages/varnish/reload-vcl:1.4 Thu Jan 7 16:29:31 2010
+++ packages/varnish/reload-vcl Thu Jan 7 17:01:34 2010
@@ -6,39 +6,32 @@
# Stig Sandbeck Mathisen <ssm at debian.org>
# Elan Ruusamäe <glen at pld-linux.org>
-if [ -z "$INIT_COL" ]; then
- # if invoked directly, load rc-scripts functions
- . /etc/rc.d/init.d/functions
-fi
-
-# Settings
-defaults=/etc/sysconfig/varnish
-
# Paths
varnishadm=/usr/bin/varnishadm
date=/bin/date
mktemp=/bin/mktemp
-# 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}"
-else
- vcl_label="$($date +${LOGNAME}${LOGNAME:+:}%s.%N)"
-fi
+if [ -z "$INIT_COL" ]; then
+ # if invoked directly, load rc-scripts functions
+ . /etc/rc.d/init.d/functions
+
+ # Settings
+ defaults=/etc/sysconfig/varnish
-# Load defaults file
-if [ -f "$defaults" ]; then
- if [ -r "$defaults" ]; then
- . "$defaults"
+ # Load defaults file
+ if [ -f "$defaults" ]; then
+ if [ -r "$defaults" ]; then
+ . "$defaults"
+ else
+ nls "Error: %s is not readable\n" $defaults
+ exit 1
+ fi
else
- nls "Error: %s is not readable\n" $defaults
+ nls "Error: %s does not exist\n" $defaults
exit 1
fi
else
- nls "Error: %s does not exist\n" $defaults
- exit 1
+ standalone=0
fi
# parse command line arguments
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/reload-vcl?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list