[4.1] 01ff71c Reduce the init script complexity.

[Lasse Karstensen]

commit 01ff71cdc765d23f61c7fad951a80ee36efbaca0
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Mon Sep 7 21:29:17 2015 +0200

    Reduce the init script complexity.
    
    I think we have enough options as it is with Varnish, we don't
    need another layer of complexity just to stitch together
    the startup arguments.

diff --git a/varnish.default b/varnish.default
index a9a063e..f8db015 100644
--- a/varnish.default
+++ b/varnish.default
@@ -1,4 +1,4 @@
-# Configuration file for varnish
+# Configuration file for Varnish Cache.
 #
 # /etc/init.d/varnish expects the variables $DAEMON_OPTS, $NFILES and $MEMLOCK
 # to be set from this shell script fragment.
@@ -18,94 +18,9 @@ NFILES=131072
 # you need to increase this number as well
 MEMLOCK=82000
 
-# Default varnish instance name is the local nodename.  Can be overridden with
-# the -n switch, to have more instances on a single server.
-# INSTANCE=$(uname -n)
-
-# This file contains 4 alternatives, please use only one.
-
-## Alternative 1, Minimal configuration, no VCL
-#
-# Listen on port 6081, administration on localhost:6082, and forward to
-# content server on localhost:8080.  Use a 1GB fixed-size cache file.
-#
-# DAEMON_OPTS="-a :6081 \
-#              -T localhost:6082 \
-#              -b localhost:8080 \
-#              -u varnish -g varnish \
-#              -S /etc/varnish/secret \
-#              -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
-
-
-## Alternative 2, Configuration with VCL
-#
-# Listen on port 6081, administration on localhost:6082, and forward to
-# one content server selected by the vcl file, based on the request.
-# Use a 256MB memory based cache.
-#
 DAEMON_OPTS="-a :6081 \
              -T localhost:6082 \
              -f /etc/varnish/default.vcl \
              -S /etc/varnish/secret \
              -s malloc,256m"
 
-
-## Alternative 3, Advanced configuration
-#
-# See varnishd(1) for more information.
-#
-# # Main configuration file. You probably want to change it :)
-# VARNISH_VCL_CONF=/etc/varnish/default.vcl
-#
-# # Default address and port to bind to
-# # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
-# # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
-# VARNISH_LISTEN_ADDRESS=
-# VARNISH_LISTEN_PORT=6081
-#
-# # Telnet admin interface listen address and port
-# VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
-# VARNISH_ADMIN_LISTEN_PORT=6082
-#
-# # The minimum number of worker threads to start
-# VARNISH_MIN_THREADS=1
-#
-# # The Maximum number of worker threads to start
-# VARNISH_MAX_THREADS=1000
-#
-# # Idle timeout for worker threads
-# VARNISH_THREAD_TIMEOUT=120
-#
-# # Cache file location
-# VARNISH_STORAGE_FILE=/var/lib/varnish/$INSTANCE/varnish_storage.bin
-#
-# # Cache file size: in bytes, optionally using k / M / G / T suffix,
-# # or in percentage of available disk space using the % suffix.
-# VARNISH_STORAGE_SIZE=1G
-#
-# # File containing administration secret
-# VARNISH_SECRET_FILE=/etc/varnish/secret
-#
-# # Backend storage specification
-# VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}"
-#
-# # Default TTL used when the backend does not specify one
-# VARNISH_TTL=120
-#
-# # DAEMON_OPTS is used by the init script.  If you add or remove options, make
-# # sure you update this section, too.
-# DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
-#              -f ${VARNISH_VCL_CONF} \
-#              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
-#              -t ${VARNISH_TTL} \
-#              -p thread_pool_min=${VARNISH_MIN_THREADS} \
-#              -p thread_pool_max=${VARNISH_MAX_THREADS} \
-#              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
-#              -S ${VARNISH_SECRET_FILE} \
-#              -s ${VARNISH_STORAGE}"
-#
-
-
-## Alternative 4, Do It Yourself
-#
-# DAEMON_OPTS=""