Tag 1.0.4.

git-svn-id: http://www.varnish-cache.org/svn/tags/varnish-1.0.4@1458 d4fa192b-c00b-0410-8231-f00ffab90ce4

debian/dirs

@@ -3,6 +3,5 @@ usr/bin
 usr/lib
 usr/sbin
 var/log
-var/log/varnish
 var/lib/varnish
 usr/share/lintian/overrides/

debian/rules

@@ -83,7 +83,6 @@ binary-arch: build install
 	dh_installdocs
 	# Since varnish loses its cache on restart - we don't.
 	dh_installinit -r
-	dh_installinit --name=varnishlog
 	dh_installman
 	dh_installexamples
 	dh_link

debian/varnish.default

@@ -4,9 +4,6 @@
 # shell script fragment.
 #
 
-# Maximum number of open files (for ulimit -n)
-NFILES=131072
-
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

debian/varnish.init

@@ -31,9 +31,6 @@ if [ -f /etc/default/varnish ] ; then
         . /etc/default/varnish
 fi
 
-# Open files (usually 1024, which is way too small for varnish)
-ulimit -n ${NFILES:-131072}
-
 # If $DAEMON_OPTS is not set at all in /etc/default/varnish, use minimal useful
 # defaults (Backend at localhost:8080, a common place to put a locally
 # installed application server.)

debian/varnish.varnishlog.init

-#! /bin/sh
-#
-# varnish       Control the varnish HTTP accelerator
-
-### BEGIN INIT INFO
-# Provides:          varnishlog
-# Required-Start:    $local_fs $network
-# Required-Stop:     $local_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start HTTP accelerator log daemon
-# Description:       This script provides logging for varnish
-### END INIT INFO
-
-# Source function library
-. /lib/lsb/init-functions
-
-NAME=varnishlog
-DESC="HTTP accelerator log deamon"
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/$NAME.pid
-LOGFILE=/var/log/varnish/varnish.log
-
-test -x $DAEMON || exit 0
-
-DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE"
-
-case "$1" in
-	start)
-		output=$(/bin/tempfile -s.varnish)
-		log_daemon_msg "Starting $DESC" 
-		log_progress_msg $NAME
-                if start-stop-daemon \
-		   --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- \
-                   ${DAEMON_OPTS} > ${output} 2>&1; then
-			log_end_msg 0
-		else
-			log_end_msg 1
-			cat $output
-		fi
-		rm $output
-		;;
-	stop)
-		log_daemon_msg "Stopping $DESC"
-		log_progress_msg $NAME
-		if start-stop-daemon \
-		   --stop --quiet --pidfile $PIDFILE --oknodo --retry 10 \
-		   --exec $DAEMON; then
-			log_end_msg 0
-		else
-			log_end_msg 1
-		fi
-        	;;
-	restart|force-reload)
-		$0 stop
-		$0 start
-        	;;
-	*)
-        	log_success_msg "Usage: $0 {start|stop|restart|force-reload}"
-        	exit 1
-        ;;
-esac
-
-exit 0