--- varnish-2.0.4.orig/debian/varnish.logrotate +++ varnish-2.0.4/debian/varnish.logrotate @@ -0,0 +1,15 @@ +/var/log/varnish/varnish.log /var/log/varnish/varnishncsa.log { + daily + rotate 7 + missingok + compress + delaycompress + missingok + postrotate + for service in varnishlog varnishncsa; do + if /usr/bin/pgrep -P 1 $service >/dev/null; then + /usr/sbin/invoke-rc.d $service reload > /dev/null + fi + done + endscript +} --- varnish-2.0.4.orig/debian/varnish.install +++ varnish-2.0.4/debian/varnish.install @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- varnish-2.0.4.orig/debian/varnish.manpages +++ varnish-2.0.4/debian/varnish.manpages @@ -0,0 +1,10 @@ +bin/varnishtest/varnishtest.1 +bin/varnishncsa/varnishncsa.1 +bin/varnishhist/varnishhist.1 +bin/varnishstat/varnishstat.1 +bin/varnishreplay/varnishreplay.1 +bin/varnishadm/varnishadm.1 +bin/varnishlog/varnishlog.1 +bin/varnishtop/varnishtop.1 +bin/varnishd/varnishd.1 +man/vcl.7 --- varnish-2.0.4.orig/debian/copyright +++ varnish-2.0.4/debian/copyright @@ -0,0 +1,45 @@ +This package was debianized by Lars Bahner on +Fri, 6 Oct 2006 16:26:57 +0200. + +It was pulled from the Subversion repository with +svn co http://varnish.projects.linpro.no/svn/trunk + +Debianizations are an integral part of the main source for varnish, +so the change for Debian are made before publication of releases, +and are as such checked. + +Files are downloadable from the following URL +http://sourceforge.net/project/showfiles.php?group_id=155816 + +Copyright: 2006 Verdens Gang AS + 2006 Linpro AS +All rights reserved. + +License: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The Debian packaging is copyright + © 2006, Lars Bahner + © 2006-2009 Stig Sandbeck Mathisen +and is licensed under the GPL version 2. The full text of which can be found in +the file /usr/share/common-licenses/GPL-2 on this system. --- varnish-2.0.4.orig/debian/libvarnish1.symbols +++ varnish-2.0.4/debian/libvarnish1.symbols @@ -0,0 +1,170 @@ +libvarnish.so.1 libvarnish1 #MINVER# + FreeArgv@Base 2.0~rc1 + ParseArgv@Base 2.0~rc1 + SHA256_Final@Base 2.0.3 + SHA256_Init@Base 2.0.3 + SHA256_Test@Base 2.0.3 + SHA256_Update@Base 2.0.3 + SUB_run@Base 2.0.3 + TCP_blocking@Base 2.0~rc1 + TCP_close@Base 2.0~rc1 + TCP_connect@Base 2.0~rc1 + TCP_filter_http@Base 2.0~rc1 + TCP_myname@Base 2.0~rc1 + TCP_name@Base 2.0~rc1 + TCP_nonblocking@Base 2.0~rc1 + TCP_set_read_timeout@Base 2.0.3 + TIM_format@Base 2.0~rc1 + TIM_mono@Base 2.0~rc1 + TIM_parse@Base 2.0~rc1 + TIM_real@Base 2.0~rc1 + TIM_sleep@Base 2.0~rc1 + VLU_Destroy@Base 2.0~rc1 + VLU_Fd@Base 2.0~rc1 + VLU_File@Base 2.0~rc1 + VLU_New@Base 2.0~rc1 + VLU_SetTelnet@Base 2.0.4 + VSS_bind@Base 2.0~rc1 + VSS_connect@Base 2.0~rc1 + VSS_listen@Base 2.0~rc1 + VSS_open@Base 2.0~rc1 + VSS_parse@Base 2.0~rc1 + VSS_resolve@Base 2.0~rc1 + binheap_delete@Base 2.0~rc1 + binheap_insert@Base 2.0~rc1 + binheap_new@Base 2.0~rc1 + binheap_root@Base 2.0~rc1 + cli_concat@Base 2.0~rc1 + cli_dispatch@Base 2.0~rc1 + cli_func_help@Base 2.0~rc1 + cli_func_ping@Base 2.0~rc1 + cli_out@Base 2.0~rc1 + cli_param@Base 2.0~rc1 + cli_quote@Base 2.0~rc1 + cli_readres@Base 2.0~rc1 + cli_result@Base 2.0~rc1 + cli_writeres@Base 2.0~rc1 + crc32@Base 2.0~rc1 + crc32_l@Base 2.0~rc1 + flopen@Base 2.0~rc1 + inxorcise@Base 2.0.4 + lbv_assert@Base 2.0~rc1 + str2bytes@Base 2.0~rc1 + varnish_version@Base 2.0~rc1 + vct_typtab@Base 2.0~rc1 + vev_add@Base 2.0~rc1 + vev_del@Base 2.0~rc1 + vev_destroy_base@Base 2.0~rc1 + vev_new@Base 2.0~rc1 + vev_new_base@Base 2.0~rc1 + vev_schedule@Base 2.0~rc1 + vev_schedule_one@Base 2.0~rc1 + vpf_close@Base 2.0~rc1 + vpf_open@Base 2.0~rc1 + vpf_remove@Base 2.0~rc1 + vpf_write@Base 2.0~rc1 + vreadfile@Base 2.0.3 + vsb_bcat@Base 2.0~rc1 + vsb_bcpy@Base 2.0~rc1 + vsb_cat@Base 2.0~rc1 + vsb_clear@Base 2.0~rc1 + vsb_cpy@Base 2.0~rc1 + vsb_data@Base 2.0~rc1 + vsb_delete@Base 2.0~rc1 + vsb_done@Base 2.0~rc1 + vsb_finish@Base 2.0~rc1 + vsb_len@Base 2.0~rc1 + vsb_new@Base 2.0~rc1 + vsb_overflowed@Base 2.0~rc1 + vsb_printf@Base 2.0~rc1 + vsb_putc@Base 2.0~rc1 + vsb_quote@Base 2.0.3 + vsb_setpos@Base 2.0~rc1 + vsb_trim@Base 2.0~rc1 + vsb_vprintf@Base 2.0~rc1 + vtmpfile@Base 2.0~rc1 +libvarnishapi.so.1 libvarnish1 #MINVER# + VSL_Arg@Base 2.0~rc1 + VSL_Dispatch@Base 2.0~rc1 + VSL_H_Print@Base 2.0~rc1 + VSL_Name@Base 2.0~rc1 + VSL_New@Base 2.0~rc1 + VSL_NextLog@Base 2.0~rc1 + VSL_NonBlocking@Base 2.0~rc1 + VSL_OpenLog@Base 2.0~rc1 + VSL_OpenStats@Base 2.0~rc1 + VSL_Select@Base 2.0~rc1 + VSL_tags@Base 2.0~rc1 + base64_decode@Base 2.0~rc1 + base64_init@Base 2.0~rc1 + varnish_instance@Base 2.0~rc1 +libvarnishcompat.so.1 libvarnish1 #MINVER# + setproctitle@Base 2.0~rc1 + srandomdev@Base 2.0~rc1 + strlcat@Base 2.0~rc1 + strlcpy@Base 2.0~rc1 +#MISSING: 2.0.3# strvis@Base 2.0~rc1 +#MISSING: 2.0.3# strvisx@Base 2.0~rc1 +#MISSING: 2.0.3# vis@Base 2.0~rc1 +libvcl.so.1 libvarnish1 #MINVER# + EncToken@Base 2.0~rc1 + Fb@Base 2.0~rc1 + Fc@Base 2.0~rc1 + Ff@Base 2.0~rc1 + Fh@Base 2.0~rc1 + Fi@Base 2.0~rc1 + IsMethod@Base 2.0~rc1 + TlAlloc@Base 2.0~rc1 + TlFree@Base 2.0~rc1 + VCC_Compile@Base 2.0~rc1 +#MISSING: 2.0.3# VCC_CompileFile@Base 2.0~rc1 + VCC_InitCompile@Base 2.0~rc1 + VCC_Return_Name@Base 2.0.3 + method_tab@Base 2.0~rc1 + vcc_Acl@Base 2.0~rc1 + vcc_AddCall@Base 2.0~rc1 + vcc_AddDef@Base 2.0~rc1 + vcc_AddProc@Base 2.0~rc1 + vcc_AddRef@Base 2.0~rc1 + vcc_AddToken@Base 2.0~rc1 + vcc_AddUses@Base 2.0~rc1 + vcc_CheckAction@Base 2.0~rc1 + vcc_CheckReferences@Base 2.0~rc1 + vcc_CheckUses@Base 2.0~rc1 + vcc_Cond_Ip@Base 2.0~rc1 + vcc_Coord@Base 2.0~rc1 + vcc_DoubleVal@Base 2.0~rc1 + vcc_ErrToken@Base 2.0~rc1 + vcc_ErrWhere@Base 2.0~rc1 + vcc_ExpectCid@Base 2.0~rc1 + vcc_ExpectedStringval@Base 2.0~rc1 + vcc_FieldsOk@Base 2.0~rc1 + vcc_FindVar@Base 2.0~rc1 + vcc_FldSpec@Base 2.0~rc1 + vcc_IdIs@Base 2.0~rc1 + vcc_IsField@Base 2.0~rc1 + vcc_Lexer@Base 2.0~rc1 + vcc_NextToken@Base 2.0~rc1 + vcc_Parse@Base 2.0~rc1 + vcc_ParseAction@Base 2.0~rc1 + vcc_ParseBackendHost@Base 2.0~rc1 + vcc_ParseDirector@Base 2.0~rc1 + vcc_ParseRandomDirector@Base 2.0~rc1 + vcc_ParseRoundRobinDirector@Base 2.0~rc1 + vcc_ProcAction@Base 2.0~rc1 + vcc_RTimeVal@Base 2.0~rc1 + vcc_RateVal@Base 2.0~rc1 + vcc_ResetFldSpec@Base 2.0~rc1 + vcc_SizeVal@Base 2.0~rc1 + vcc_StringVal@Base 2.0~rc1 + vcc_Teq@Base 2.0~rc1 + vcc_TimeVal@Base 2.0~rc1 + vcc_UintVal@Base 2.0~rc1 + vcc__ErrInternal@Base 2.0~rc1 + vcc__Expect@Base 2.0~rc1 + vcc_regexp@Base 2.0~rc1 + vcc_vars@Base 2.0~rc1 + vcl_fixed_token@Base 2.0~rc1 +#MISSING: 2.0.3# vcl_init_tnames@Base 2.0~rc1 + vcl_output_lang_h@Base 2.0~rc1 + vcl_tnames@Base 2.0~rc1 --- varnish-2.0.4.orig/debian/reload-vcl +++ varnish-2.0.4/debian/reload-vcl @@ -0,0 +1,151 @@ +#!/bin/sh + +# reload-varnish: Script to reload varnishd from VCL defined in +# /etc/default/varnish. +# +# Stig Sandbeck Mathisen + +# Settings +defaults=/etc/default/varnish + +# Paths +varnishadm=/usr/bin/varnishadm +date=/bin/date +tempfile=/bin/tempfile + +# Messages +# msg_no_varnishadm: varnishadm +msg_no_varnishadm="Error: Cannot execute %s\n" +msg_no_management="Error: \$DAEMON_OPTS must contain '-T hostname:port'\n" +# msg_defaults_not_readable: defaults +msg_defaults_not_readable="Error: %s is not readable\n" +# msg_defaults_not_there: defaults +msg_defaults_not_there="Error: %s does not exist\n" +msg_no_vcl="Error: No VCL file used, nothing to reload\n" +msg_usage="Usage: $0 [-h][-c][-q]\n\t-h\tdisplay help\n\t-q\tquiet\n\t-c\tcompile only, do not reload\n" +# msg_compile_only: varnishadm, mgmt_interface, vcl_label +msg_compile_only="To activate, run:\n\t%s -T %s \\\\\n\tvcl.use %s\n" +# msg_compile_failed: vcl_label, vcl_file +msg_compile_failed="Error: vcl.load %s %s failed" +# msg_use_ok: vcl_label +msg_use_ok="VCL reloaded, active label is %s\n" +# msg_use_failed: vcl_label +msg_use_failed="Error: vcl.use %s failed\n" + +# 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 + +# Load defaults file +if [ -f "$defaults" ] +then + if [ -r "$defaults" ] + then + . "$defaults" + else + printf >&2 "$msg_defaults_not_readable" $defaults + exit 1 + fi +else + printf >&2 "$msg_defaults_not_there" $defaults + exit 1 +fi + +# parse command line arguments +while getopts hcq flag +do + case $flag in + h) + printf >&2 "$msg_usage" + exit 0 + ;; + c) + compile_only=1 + ;; + q) + quiet=1 + ;; + *) + printf >&2 "$msg_usage\n" + exit 1 + ;; + esac +done + +# Parse $DAEMON_OPTS (options must be kept in sync with varnishd). +# Extract the -f and the -T option, and (try to) ensure that the +# management interface is on the form hostname:address +OPTIND=1 +while getopts a:b:dFf:g:h:l:n:P:p:s:T:t:u:Vw: flag $DAEMON_OPTS +do + case $flag in + f) + if [ -f "$OPTARG" ]; then + vcl_file="$OPTARG" + fi + ;; + T) + if [ -n "$OPTARG" -a "$OPTARG" != "${OPTARG%%:*}" ] + then + mgmt_interface="$OPTARG" + fi + ;; + esac +done + +# Sanity checks +if [ ! -x "$varnishadm" ] +then + printf >&2 "$msg_no_varnishadm" $varnishadm + exit 1 +fi + +if [ -z "$mgmt_interface" ] +then + printf >&2 "$msg_no_management" + exit 1 +fi + +if [ -z "$vcl_file" ] +then + printf >&2 "$msg_no_vcl" + exit 1 +fi + +logfile=$($tempfile -n /tmp/$vcl_label) + +# Compile and maybe reload +if $varnishadm -T $mgmt_interface vcl.load $vcl_label $vcl_file +then + if [ -n "$compile_only" ] + then + printf "$msg_compile_only" $varnishadm $mgmt_interface $vcl_label + else + if $varnishadm -T $mgmt_interface vcl.use $vcl_label + then + printf "$msg_use_ok" $vcl_label + else + printf "$msg_use_failed" $vcl_label + exitstatus=1 + fi + fi +else + printf "$msg_compile_failed" $vcl_label $vcl_file + exitstatus=1 +fi | grep -v "^$" > $logfile + +# Blather +if [ -z "${quiet}" -o -n "$exitstatus" ] +then + cat >&2 $logfile +fi + +# Cleanup +rm -f $logfile +exit $exitstatus --- varnish-2.0.4.orig/debian/varnish.init +++ varnish-2.0.4/debian/varnish.init @@ -0,0 +1,89 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: varnish +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start HTTP accelerator +# Description: This script provides a server-side cache +# to be run in front of a httpd and should +# listen on port 80 on a properly configured +# system +### END INIT INFO + +# Source function library +. /lib/lsb/init-functions + +NAME=varnishd +DESC="HTTP accelerator" +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/varnishd +PIDFILE=/var/run/$NAME.pid + +test -x $DAEMON || exit 0 + +# Include varnish defaults if available +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} + +# Maxiumum locked memory size for shared memory log +ulimit -l ${MEMLOCK:-82000} + +# 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.) +DAEMON_OPTS=${DAEMON_OPTS:--b localhost} + +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} -- \ + -P ${PIDFILE} ${DAEMON_OPTS} > ${output} 2>&1; then + log_end_msg 0 + else + log_end_msg 1 + cat $output + exit 1 + fi + rm $output + ;; + stop) + log_daemon_msg "Stopping $DESC" + log_progress_msg $NAME + if start-stop-daemon \ + --stop --quiet --pidfile $PIDFILE --retry 10 \ + --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + reload) + log_daemon_msg "Reloading $DESC" + log_progress_msg $NAME + if /usr/share/varnish/reload-vcl -q; 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 --- varnish-2.0.4.orig/debian/varnish.varnishlog.init +++ varnish-2.0.4/debian/varnish.varnishlog.init @@ -0,0 +1,86 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: varnishlog +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_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 + +# Include defaults if available +if [ -f /etc/default/$NAME ] ; then + . /etc/default/$NAME +fi + +# If unset, or set to "0" or "no", exit +if [ -z "${VARNISHLOG_ENABLED}" ] || \ + [ "${VARNISHLOG_ENABLED}" = "0" ] || \ + [ "${VARNISHLOG_ENABLED}" = "no" ]; then + exit 0; +fi + +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 + exit 1 + fi + rm $output + ;; + stop) + log_daemon_msg "Stopping $DESC" + log_progress_msg $NAME + if start-stop-daemon \ + --stop --quiet --pidfile $PIDFILE --retry 10 \ + --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + reload) + log_daemon_msg "Reloading $DESC" + log_progress_msg $NAME + if kill -HUP $(cat $PIDFILE) >/dev/null 2>&1; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload|reload}" + exit 1 + ;; +esac + +exit 0 --- varnish-2.0.4.orig/debian/libvarnish1.install +++ varnish-2.0.4/debian/libvarnish1.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- varnish-2.0.4.orig/debian/rules +++ varnish-2.0.4/debian/rules @@ -0,0 +1,108 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# Disable jemalloc for architectures that lack *_2POW definitions +ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:hppa:s390:sparc:m68k:)) + ARCH_CONFIG_FLAGS="--disable-jemalloc" +endif + +configure: + ./autogen.sh + +config.status: configure + dh_testdir + # The boilerplate linker flags won't allow varnish to compile :( + # There are circular dependencies in the varnish libraries, but + # the core developers have OK'ed that we don't check. + [ -r /usr/share/misc/config.sub ] && \ + cp -f /usr/share/misc/config.sub config.sub || true + [ -r /usr/share/misc/config.guess ] && \ + cp -f /usr/share/misc/config.guess config.guess || true + ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + $(ARCH_CONFIG_FLAGS) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + CFLAGS="$(CFLAGS)" --localstatedir=/var/lib + +build: build-stamp $(QUILT_STAMPFN) + +build-stamp: config.status + dh_testdir + $(MAKE) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + [ -f config.sub.orig ] && mv config.sub.orig config.sub || true + [ -f config.guess.orig ] && mv config.sub.orig config.guess || true + if [ -f Makefile ]; then make distclean ; fi + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install --sourcedir=$(CURDIR)/debian/tmp + sed '/backend default {/,/}/ s/^#//' $(CURDIR)/etc/default.vcl > $(CURDIR)/debian/varnish/etc/varnish/default.vcl + install -m 644 $(CURDIR)/debian/varnish.logrotate $(CURDIR)/debian/varnish/etc/logrotate.d/varnish + install -m 755 $(CURDIR)/debian/reload-vcl $(CURDIR)/debian/varnish/usr/share/varnish/reload-vcl + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installinit + dh_installinit --name=varnishlog + dh_installinit --name=varnishncsa + dh_installman + dh_installexamples + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- varnish-2.0.4.orig/debian/libvarnish-dev.install +++ varnish-2.0.4/debian/libvarnish-dev.install @@ -0,0 +1,4 @@ +usr/include +usr/lib/*.a +usr/lib/*.la +usr/lib/pkgconfig/*.pc --- varnish-2.0.4.orig/debian/varnish.dirs +++ varnish-2.0.4/debian/varnish.dirs @@ -0,0 +1,8 @@ +etc/varnish +etc/logrotate.d +usr/bin +usr/sbin +var/log +var/log/varnish +var/lib/varnish +usr/share/varnish --- varnish-2.0.4.orig/debian/control +++ varnish-2.0.4/debian/control @@ -0,0 +1,40 @@ +Source: varnish +Section: web +Priority: optional +Maintainer: Stig Sandbeck Mathisen +Uploaders: Lars Bahner , Fabio Tranchitella , Micah Anderson +Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, libncurses-dev, xsltproc, groff-base, quilt +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-varnish/packages/varnish/ +Vcs-Svn: svn://svn.debian.org/pkg-varnish/packages/varnish +XBS-Homepage: http://varnish.projects.linpro.no/ +Standards-Version: 3.8.2 + +Package: varnish +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libc6-dev | libc6.1-dev | libc-dev, adduser +Description: a state-of-the-art, high-performance HTTP accelerator + Varnish is a state-of-the-art, high-performance HTTP accelerator. It uses the + advanced features in Linux 2.6, FreeBSD 6/7 and Solaris 10 to achieve its high + performance. + . + Some of the features include: + * A modern design + * VCL - a very flexible configuration language + * Load balancing with health checking of backends + * Partial support for ESI - Edge Side Includes + * URL rewriting + * Graceful handling of "dead" backends + +Package: libvarnish1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: shared libraries for Varnish + Shared libraries for the Varnish HTTP accelerator. + +Package: libvarnish-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libvarnish1 +Description: development files for Varnish + Development files for the Varnish HTTP accelerator. --- varnish-2.0.4.orig/debian/libvarnish-dev.dirs +++ varnish-2.0.4/debian/libvarnish-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/lib/pkgconfig --- varnish-2.0.4.orig/debian/compat +++ varnish-2.0.4/debian/compat @@ -0,0 +1 @@ +5 --- varnish-2.0.4.orig/debian/watch +++ varnish-2.0.4/debian/watch @@ -0,0 +1,4 @@ +version=3 + +# New versions of Varnish are available at SourceForge +http://sf.net/varnish/varnish-(.*)\.tar\.gz --- varnish-2.0.4.orig/debian/varnish.docs +++ varnish-2.0.4/debian/varnish.docs @@ -0,0 +1,2 @@ +README +doc/*.html --- varnish-2.0.4.orig/debian/varnish.default +++ varnish-2.0.4/debian/varnish.default @@ -0,0 +1,97 @@ +# Configuration file for varnish +# +# /etc/init.d/varnish expects the variables $DAEMON_OPTS, $NFILES and $MEMLOCK +# to be set from this shell script fragment. +# + +# Maximum number of open files (for ulimit -n) +NFILES=131072 + +# Maximum locked memory size (for ulimit -l) +# Used for locking the shared memory log in memory. If you increase log size, +# 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 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 1GB +# fixed-size cache file. +# +DAEMON_OPTS="-a :6081 \ + -T localhost:6082 \ + -f /etc/varnish/default.vcl \ + -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G" + + +## 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 +# +# # 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} \ +# -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \ +# -s ${VARNISH_STORAGE}" +# + + +## Alternative 4, Do It Yourself +# +# DAEMON_OPTS="" --- varnish-2.0.4.orig/debian/varnish.varnishncsa.init +++ varnish-2.0.4/debian/varnish.varnishncsa.init @@ -0,0 +1,86 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: varnishncsa +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start HTTP accelerator ncsa log daemon +# Description: This script provides logging for varnish on the ncsa format +### END INIT INFO + +# Source function library +. /lib/lsb/init-functions + +NAME=varnishncsa +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/varnishncsa.log + +# Include defaults if available +if [ -f /etc/default/$NAME ] ; then + . /etc/default/$NAME +fi + +# If unset, or set to "0" or "no", exit +if [ -z "${VARNISHNCSA_ENABLED}" ] || \ + [ "${VARNISHNCSA_ENABLED}" = "0" ] || \ + [ "${VARNISHNCSA_ENABLED}" = "no" ]; then + exit 0; +fi + +test -x $DAEMON || exit 0 + +DAEMON_OPTS="-a -c -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 + exit 1 + fi + rm $output + ;; + stop) + log_daemon_msg "Stopping $DESC" + log_progress_msg $NAME + if start-stop-daemon \ + --stop --quiet --pidfile $PIDFILE --retry 10 \ + --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + reload) + log_daemon_msg "Reloading $DESC" + log_progress_msg $NAME + if kill -HUP $(cat $PIDFILE) >/dev/null 2>&1; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload|reload}" + exit 1 + ;; +esac + +exit 0 --- varnish-2.0.4.orig/debian/varnish.postinst +++ varnish-2.0.4/debian/varnish.postinst @@ -0,0 +1,41 @@ +#!/bin/sh + +# Postinst script for varnish. +# Stig Sandbeck Mathisen + +# Settings +user=varnish +group=$user +dir=/var/lib/varnish/$(uname -n) + +# Get return code from getent to check if user exists +getent passwd $user >/dev/null +getent=$? + +# For the remainder of the script, exit if we encounter an error +set -e + +varnish_setup_user() { + if [ "$getent" = "0" ]; then + # user exists, do nothing + : + elif [ "$getent" = "2" ]; then + # user does not exist, create it + adduser --quiet --system --no-create-home --group $user + else + # getent could not figure out if the user exists or not, this + # is an error, see getent(1) for more information. Exit with + # getent's exit code + return $getent + fi +} +varnish_create_storagedir() { + if ! [ -d "$dir" ]; then + install -o $user -g $group -d $dir + fi +} + +varnish_setup_user +varnish_create_storagedir + +#DEBHELPER# --- varnish-2.0.4.orig/debian/Makefile.am +++ varnish-2.0.4/debian/Makefile.am @@ -0,0 +1,25 @@ +# $Id: Makefile.am 2173 2007-10-28 18:43:24Z des $ + +EXTRA_DIST = \ + README.Debian \ + changelog \ + compat \ + control \ + copyright \ + libvarnish0-dev.dirs \ + libvarnish0-dev.install \ + libvarnish0.dirs \ + libvarnish0.install \ + lintian-override \ + rules \ + varnish.default \ + varnish.dirs \ + varnish.examples \ + varnish.init \ + varnish.install \ + varnish.logrotate \ + varnish.manpages \ + varnish.postinst \ + varnish.postrm \ + varnish.varnishlog.init \ + watch --- varnish-2.0.4.orig/debian/varnish.varnishlog.default +++ varnish-2.0.4/debian/varnish.varnishlog.default @@ -0,0 +1,8 @@ +# Configuration file for varnishlog +# +# Uncomment this to enable logging for varnish. Please make sure you have +# enough disk space for significant amounts of log data. To disable logging, +# set the variable to "0", "no", or leave it unset. +# +# Varnish log format, to be used by "varnishlog" or "varnishncsa" +# VARNISHLOG_ENABLED=1 --- varnish-2.0.4.orig/debian/varnish.examples +++ varnish-2.0.4/debian/varnish.examples @@ -0,0 +1,2 @@ +etc/zope-plone.vcl +bin/varnishd/default.vcl --- varnish-2.0.4.orig/debian/varnish.postrm +++ varnish-2.0.4/debian/varnish.postrm @@ -0,0 +1,47 @@ +#! /bin/sh -e + +set -e + +case "$1" in + upgrade) + ;; + + remove|failed-upgrade|abort-install|abort-upgrade|disappear) + + if test -e /var/log/varnish ; then + + rm -r /var/log/varnish > /dev/null 2>&1 || exit 78 + + fi + + if test -e /var/lib/varnish; then + + rm -r /var/lib/varnish > /dev/null 2>&1 || exit 78 + fi + + ;; + + purge) + + if test -e /var/log/varnish; then + + rm -r /var/log/varnish > /dev/null 2>&1 || exit 78 + + fi + + if test -e /var/lib/varnish; then + + rm -r /var/lib/varnish > /dev/null 2>&1 || exit 78 + fi + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 64 + +esac + +#DEBHELPER# + +exit 0 --- varnish-2.0.4.orig/debian/libvarnish1.dirs +++ varnish-2.0.4/debian/libvarnish1.dirs @@ -0,0 +1 @@ +usr/lib --- varnish-2.0.4.orig/debian/changelog +++ varnish-2.0.4/debian/changelog @@ -0,0 +1,229 @@ +varnish (2.0.4-5~bpo50+1) lenny-backports; urgency=low + + * Update backport to current testing version + + -- Micah Anderson Sat, 29 Aug 2009 15:51:18 +0000 + +varnish (2.0.4-5) unstable; urgency=low + + * Add s390 to list of architectures not using jemalloc + + -- Stig Sandbeck Mathisen Mon, 27 Jul 2009 21:49:42 +0000 + +varnish (2.0.4-4) unstable; urgency=low + + * Remove s390 jemalloc patch + * Add patch for varnishd(1) + + -- Stig Sandbeck Mathisen Fri, 24 Jul 2009 13:02:38 +0000 + +varnish (2.0.4-3) unstable; urgency=low + + * Actually check for s390 in the jemalloc patch. + + -- Stig Sandbeck Mathisen Tue, 21 Jul 2009 20:29:29 +0000 + +varnish (2.0.4-2) unstable; urgency=low + + * Change Vcs-Browser and Vcs-Svn to reflect the packaging move to + alioth + * Add support for VCL reload via /etc/init.d/varnishd reload + * Added a symbols file for libvarnish1 + * Add patch from Ingvar Hagelund to define *_2POW on s390, we should then be + able to use jemalloc + * Add build dependency on quilt + + -- Stig Sandbeck Mathisen Wed, 10 Jun 2009 17:11:03 +0000 + +varnish (2.0.4-1) unstable; urgency=low + + * New upstream version + + -- Stig Sandbeck Mathisen Mon, 27 Apr 2009 08:12:28 +0000 + +varnish (2.0.3-2) UNRELEASED; urgency=low + + * Add /usr/lib/pkgconfig/varnishapi.pc to the libvarnish-dev package + + -- Stig Sandbeck Mathisen Thu, 19 Feb 2009 07:22:14 +0100 + +varnish (2.0.3-1) unstable; urgency=low + + * New upstream version + + -- Stig Sandbeck Mathisen Wed, 18 Feb 2009 09:04:17 +0000 + +varnish (2.0.2-1) unstable; urgency=low + + * New upstream version + * Change defaults to use configuration file /etc/varnish/default.vcl + when starting varnishd + + -- Stig Sandbeck Mathisen Mon, 17 Nov 2008 07:31:05 +0100 + +varnish (2.0.1-2) unstable; urgency=low + + [ Kees Cook ] + * debian/rules: disable jemalloc on architectures that lack *_2POW + definitions (Closes: #503381). + + [ Stig Sandbeck Mathisen ] + * Add a man page for varnishtest + * Disable jemalloc on m64k as well + + -- Stig Sandbeck Mathisen Thu, 30 Oct 2008 08:00:56 +0100 + +varnish (2.0.1-1) unstable; urgency=low + + * New upstream version + * Fix synopsis on binary packages (Closes: #502118) + + -- Stig Sandbeck Mathisen Fri, 17 Oct 2008 21:03:16 +0200 + +varnish (2.0-1) unstable; urgency=low + + * New upstream version + * Add varnishncsa init script, defaults and log rotation (Closes: #501454) + * Add dependency on libc6.1-dev (Closes: #481067) + + -- Stig Sandbeck Mathisen Thu, 16 Oct 2008 14:04:42 +0200 + +varnish (2.0~rc1-1) unstable; urgency=low + + * New upstream version + * Fix syntax error in varnishlog init script + + -- Stig Sandbeck Mathisen Wed, 08 Oct 2008 13:45:40 +0200 + +varnish (2.0~beta1-1) UNRELEASED; urgency=low + + [ Stig Sandbeck Mathisen ] + * New upstream release + + [ Tollef Fog Heen ] + * Fix up clean rule so as to work correctly on fresh sources too. + * Fix up Makefile.am to get rid of files we don't ship. + * Fix XSIsm in debian/varnish.varnishlog.init (-o in a test). + * Rename libvarnish0-dev to libvarnish-dev again, bump soname to + libvarnish1. + + -- Stig Sandbeck Mathisen Mon, 01 Sep 2008 09:05:44 +0000 + +varnish (1.2-0) unstable; urgency=low + + [ Stig Sandbeck Mathisen ] + * New upstream release. + * Check if varnishlog is running before attempting reload from + logrotate postscript. (Closes: #462029) + + [ Fabio Tranchitella ] + * debian/varnish.dirs: removed unused lintian overrides dir. + * debian/rules: backup and restore of config.sub and config.guess to not + include them into the diff.gz in case of multiple builds from the same + working directory. + + [ Tollef Fog Heen ] + * Remove TODO from Makefile.am to make make dist happier. + * Run make distclean if Makefile exists. + + -- Tollef Fog Heen Mon, 23 Jun 2008 16:04:38 +0200 + +varnish (1.1.2) unstable; urgency=low + + * New upstream release + * Renamed library and development packages to reflect sonames + + -- Stig Sandbeck Mathisen Wed, 12 Sep 2007 16:05:22 +0200 + +varnish (1.1.1-1) unstable; urgency=low + + [Lars Bahner] + * New upstream release + * User and Group id added to default DAEMON_OPTS + * Added user and group creation to postinst + * Added missing man pages + + [Stig Sandbeck Mathisen] + * Set statedir to /var/lib + * Removed -n switch from varnish defaults file and varnishlog init script. + Use the default instance name instead. + + -- Stig Sandbeck Mathisen Tue, 04 Sep 2007 12:27:09 +0200 + +varnish (1.1-1) unstable; urgency=low + + * New upstream release + * Split package into varnish, libvarnish and libvarnish-dev + + -- Stig Sandbeck Mathisen Fri, 20 Jul 2007 14:37:36 +0200 + +varnish (1.0.4-1) unstable; urgency=low + + * New upstream version (Closes: #424560) + * Use the upstream default configuration file, renamed to default.vcl. + Default template in /etc/default/varnish does not use this, but a + commented-out alternative does. + * Changed init script. Use lsb init library functions, move more defaults + to /etc/default/varnish, to make init script simpler. + * Changed postrm, /var/lib/varnish disappeared on upgrade, making varnish + non-startable. + * Added example vcl for zope and plone. + + -- ssm Wed, 16 May 2007 13:50:08 +0200 + +varnish (1.0.3-2) unstable; urgency=low + + * Added postrm to partially solve 400384 + + -- Lars Bahner Tue, 27 Feb 2007 20:41:10 +0100 + +varnish (1.0.3-1) unstable; urgency=low + + * new upstream release + * set VARNISH_MAX_WORKER_THREADS to 2048 instead of INF. + (closes: #412004) + + -- Lars Bahner Tue, 27 Feb 2007 20:16:38 +0100 + +varnish (1.0.2-2) unstable; urgency=low + + * Preliminary LSB compliabnce in init-script + * Lintian override + + -- Lars Bahner Mon, 23 Oct 2006 14:20:22 +0200 + +varnish (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Lars Bahner Thu, 19 Oct 2006 15:51:37 +0200 + +varnish (1.0.2-1~svn20061012) unstable; urgency=low + + * Added README for Debian + * svn-based source + * Added target to create configure to build from pristine source + * Added init-script and defaults + * Moved backend storage to /var/lib/varnish/ + + -- Lars Bahner Fri, 13 Oct 2006 09:58:13 +0200 + +varnish (1.0.1-3) unstable; urgency=low + + * Bumped automake dependency to automake1.9 + + -- Lars Bahner Tue, 10 Oct 2006 15:00:39 +0200 + +varnish (1.0.1-2) unstable; urgency=low + + * Removed wrong upstream author. + * Added dependency on gcc-4.1 needed by varnish at runtime. + + -- Lars Bahner Fri, 6 Oct 2006 17:54:53 +0200 + +varnish (1.0.1-1) unstable; urgency=low + + * Initial release (Closes: #382451) + + -- Lars Bahner Fri, 6 Oct 2006 16:26:57 +0200 + --- varnish-2.0.4.orig/debian/varnish.varnishncsa.default +++ varnish-2.0.4/debian/varnish.varnishncsa.default @@ -0,0 +1,8 @@ +# Configuration file for varnishncsa +# +# Uncomment this to enable logging for varnish. Please make sure you have +# enough disk space for significant amounts of log data. To disable logging, +# set the variable to "0", "no", or leave it unset. +# +# NCSA log format, to be used by HTTP log analyzers +# VARNISHNCSA_ENABLED=1 --- varnish-2.0.4.orig/debian/patches/series +++ varnish-2.0.4/debian/patches/series @@ -0,0 +1 @@ +varnishd.1.patch --- varnish-2.0.4.orig/debian/patches/varnishd.1.patch +++ varnish-2.0.4/debian/patches/varnishd.1.patch @@ -0,0 +1,214 @@ +--- a/bin/varnishd/varnishd.1 ++++ b/bin/varnishd/varnishd.1 +@@ -26,7 +26,7 @@ + .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + .\" SUCH DAMAGE. + .\" +-.\" $Id: varnishd.1 3960 2009-03-19 12:58:39Z tfheen $ ++.\" $Id$ + .\" + .Dd February 17, 2008 + .Dt VARNISHD 1 +@@ -326,8 +326,12 @@ + address and port. + The following commands are available: + .Bl -tag -width 4n +-.It Cm help ++.It Cm help Op Ar command + Display a list of available commands. ++.Pp ++If the ++.Ar command ++is specified, display help for this command. + .It Cm param.set Ar param Ar value + Set the parameter specified by + .Ar param +@@ -336,35 +340,78 @@ + See + .Sx Run-Time Parameters + for a list of parameters. +-.It Cm param.show Ar param +-Display the value of the parameter specified by +-.Ar param . +-See +-.Sx Run-Time Parameters +-for a list of parameters. +-.It Cm param.show Op Fl l +-Display a list of run-time parameters and their values. ++.It Xo ++.Cm param.show ++.Op Fl l ++.Op Ar param ++.Xc ++Display a list if run-time parameters and their values. ++.Pp + If the + .Fl l + option is specified, the list includes a brief explanation of each + parameter. ++.Pp ++If a ++.Ar param ++is specified, display only the value and explanation for this ++parameter. + .It Cm ping Op Ns Ar timestamp +-Ping the child process. ++Ping the Varnish cache process, keeping the connection alive. ++.It Cm purge Ar field Ar operator Ar argument Op && Ar field Ar operator Ar argument Op ... ++Immediately invalidate all documents matching the purge expression. ++See ++.Va Purge expressions ++for more documentation and examples. ++.It Cm purge.hash Ar regex ++Immediately invalidate all documents where ++.Va obj.hash ++matches the ++.Va regex . ++The default object hash contains the values from ++.Va req.url ++and either ++.Va req.http.host ++or ++.Va server.ip ++depending on the presence of a Host: header in the request sent by the ++client. ++The object hash may be modified further by ++.Va VCL. ++.It Cm purge.list ++Display the purge list. ++.Pp ++All requests for objects from the cache are matched against items on ++the purge list. ++If an object in the cache is older than a matching purge list item, it ++is considered ++.Qq purged , ++and will be fetched from the backend instead. ++.Pp ++When a purge expression is older than all the objects in the cache, it ++is removed from the list. ++.It Cm purge.url Ar regexp ++Immediately invalidate all documents whose URL matches the specified ++regular expression. ++.It Cm quit ++Close the connection to the varnish admin port. + .It Cm start +-Start the child process if it is not already running. ++Start the Varnish cache process if it is not already running. + .It Cm stats +-Display server statistics. ++Show summary statistics. ++.Pp + All the numbers presented are totals since server startup; for a + better idea of the current situation, use the + .Xr varnishstat 1 + utility. + .It Cm status +-Check the status of the child process. ++Check the status of the Varnish cache process. + .It Cm stop +-Stop the child process. ++Stop the Varnish cache process. + .It Cm url.purge Ar regexp +-Immediately invalidate all documents whos URL matches the specified +-regular expression. ++Deprecated, see ++.Cm purge.url ++instead. + .It Cm vcl.discard Ar configname + Discard the configuration specified by + .Ar configname . +@@ -416,6 +463,11 @@ + .Pp + The default is + .Dv 60 seconds ++.It Va cli_banner ++Whether to print a banner whenever a client connects to the CLI interface. ++.Pp ++The default is ++.Dv on . + .It Va client_http11 + Whether to force the use of HTTP/1.1 when responding to client + requests, or just use the same protocol version as that used by the +@@ -514,7 +566,7 @@ + Note that several operating systems have known bugs which make it + inadvisable to use this. + .Pp +-The default is -1, which disables the use of sendfile altogether. ++The default is \-1, which disables the use of sendfile altogether. + .It Va send_timeout + The time to wait before dropping the connection to a client which is + not accepting data sent to it. +@@ -583,6 +635,65 @@ + The default is + .Dv off . + .El ++.Ss Purge expressions ++A purge expression consists of one or more conditions. ++A condition consists of a field, an operator, and an argument. ++Conditions can be ANDed together with ++.Qq && . ++.Pp ++A field can be any of the variables from VCL, for instance ++.Va req.url , ++.Va req.http.host ++or ++.Va obj.set-cookie . ++.Pp ++Operators are ++.Qq == ++for direct comparision, ++.Qq ~ ++for a regular expression match, and ++.Qq > ++or ++.Qq < ++for size comparisons. ++Prepending an operator with ++.Qq \&! ++negates the expression. ++.Pp ++The argument could be a quoted string, a regexp, or an integer. ++Integers can have ++.Qq KB , ++.Qq MB , ++.Qq GB ++or ++.Qq TB ++appended for size related fields. ++.Pp ++Simple example: All requests where ++.Va req.url ++exactly matches the string ++.Va /news ++are purged from the cache. ++.Bd -literal -offset 4n ++req.url == "/news" ++.Ed ++.Pp ++Example: Purge all documents where the name does not end with ++.Qq .ogg , ++and where the size of the object is greater than 10 megabytes. ++.Bd -literal -offset 4n ++req.url !~ "\\.ogg$" && obj.size > 10MB ++.Ed ++.Pp ++Example: Purge all documents where the serving host is ++.Qq example.com ++or ++.Qq www.example.com , ++and where the Set-Cookie header received from the backend contains ++.Qq USERID=1663 . ++.Bd -literal -offset 4n ++req.http.host ~ "^(www\\.)example.com$" && obj.set-cookie ~ "USERID=1663" ++.Ed + .Sh SEE ALSO + .Xr varnishlog 1 , + .Xr varnishhist 1 , +@@ -609,4 +720,6 @@ + .An Poul-Henning Kamp Aq phk@phk.freebsd.dk + in cooperation with Verdens Gang AS and Linpro AS. + This manual page was written by +-.An Dag-Erling Sm\(/orgrav Aq des@des.no . ++.An Dag-Erling Sm\(/orgrav Aq des@des.no ++with updates by ++.An Stig Sandbeck Mathisen Aq ssm@debian.org