← Back to branch summary

~ubuntu-branches/ubuntu/trusty/varnish/trusty

« back to all changes in this revision

Viewing changes to debian/varnish.varnishncsa.init

  • Committer: Package Import Robot
  • Author(s): Stig Sandbeck Mathisen, Tollef Fog Heen
  • Date: 2011-09-24 13:22:56 UTC
  • Revision ID: package-import@ubuntu.com-20110924132256-jgmuzmcp80k50ox1
Tags: 3.0.1-2
http://bugs.debian.org/637110
[ Tollef Fog Heen ]
* Make it possible to override DAEMON_OPTS for varnishlog and
  varnishncsa.
* Make /etc/init.d/varnish status exit with a sensible status code
  rather than always being 0 (Closes: #637110)
* Add missing options to reload-vcl to allow -C, -i, -M.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/varnish.varnishncsa.init
20
20
PIDFILE=/var/run/$NAME/$NAME.pid
21
21
LOGFILE=/var/log/varnish/varnishncsa.log
22
22
USER=varnishlog
 
23
DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE}"
23
24
 
24
25
# Include defaults if available
25
26
if [ -f /etc/default/$NAME ] ; then
35
36
 
36
37
test -x $DAEMON || exit 0
37
38
 
38
 
DAEMON_OPTS="-a -c -w ${LOGFILE} -D -P $PIDFILE"
39
 
 
40
39
start_varnishncsa() {
41
40
    output=$(/bin/tempfile -s.varnish)
42
41
    log_daemon_msg "Starting $DESC" "$NAME"