[gentoo-commits] gentoo-x86 commit in www-servers/varnish/files: varnishd.confd-r2 varnishd.initd-r2

[Anthony G. Basile (blueness)]

blueness    14/03/01 19:53:58

  Added:                varnishd.confd-r2 varnishd.initd-r2
  Log:
  Set logformat, bug #502972
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

Revision  Changes    Path
1.1                  www-servers/varnish/files/varnishd.confd-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnishd.confd-r2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnishd.confd-r2?rev=1.1&content-type=text/plain

Index: varnishd.confd-r2
===================================================================
# /etc/conf.d/varnishd

VARNISHD="/usr/sbin/varnishd"
VARNISHADM="/usr/bin/varnishadm"
CONFIGFILE="/etc/varnish/default.vcl"

# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
# Ignore the config file, /etc/varnish/default.vcl
VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"

# Alternatively, don't listen to a backend and use 
# the config file
#VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE"

# Arguments passed to varnishncsa
# Please see varnishncsa(1) for more options
VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"

# Arguments passed to varnishncsa -F option
# Please see varnishncsa(1) for more options
# VARNISHNCSA_LOGFORMAT='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"'

# We need to increase the number of open files (-n)
# and the maximum amount off locked memory (-l)
# See bug #459142
rc_ulimit="-n 32786 -l 82000"



1.1                  www-servers/varnish/files/varnishd.initd-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnishd.initd-r2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnishd.initd-r2?rev=1.1&content-type=text/plain

Index: varnishd.initd-r2
===================================================================
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd-r2,v 1.1 2014/03/01 19:53:58 blueness Exp $

extra_commands="configtest"
extra_started_commands="reload"

description_configtest="Run syntax tests for configuration files."
description_reload="Reloads the configuration."

depend() {
	need net
}

configtest() {
	ebegin "Checking ${SVCNAME} configuration"
	checkconfig
	eend $?
}

checkconfig() {
	${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
	ret=$?
	if [ $ret -ne 0 ]; then
		eerror "${SVCNAME} has detected an error in your setup:"
		${VARNISHD} -C -f ${CONFIGFILE}
	fi

	return $ret
}

start() {
	checkconfig || return 1

	ebegin "Starting varnish"
	start-stop-daemon --quiet --start --pidfile /run/varnishd.pid \
		--exec ${VARNISHD} -- \
		-P /run/varnishd.pid \
		${VARNISHD_OPTS} &> /dev/null
	eend $?

	if [ "${VARNISHNCSA_ARGS}" != "" ]; then
		ebegin "Starting varnish logging"
		start-stop-daemon --quiet --start --pidfile /run/varnishncsa.pid \
			--exec /usr/bin/varnishncsa -- \
			-D -P /run/varnishncsa.pid \
			${VARNISHNCSA_ARGS} \
			${VARNISHNCSA_LOGFORMAT:+-F "${VARNISHNCSA_LOGFORMAT}"}
		eend $?
	fi
}

stop() {
	ebegin "Stopping varnish"
	start-stop-daemon --quiet --stop --pidfile /run/varnishd.pid
	eend $?

	if [ -e /run/varnishncsa.pid ]; then
		ebegin "Stopping varnish logging"
		start-stop-daemon --quiet --stop --pidfile /run/varnishncsa.pid
		eend $?
	fi
}

reload() {
	checkconfig || return 1

	ebegin "Reloading varnish"

	$VARNISHADM vcl.list >/dev/null 2>&1
	ret=$?
	if [ $ret -ne 0 ]; then
		eerror "${SVCNAME} cannot list configuration"
		return 1
	fi

	new_config="reload_$(date +%FT%H:%M:%S)"
	$VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
	ret=$?
	if [ $ret -ne 0 ]; then
		eerror "${SVCNAME} cannot load configuration"
		return 1
	fi
	
	$VARNISHADM vcl.use $new_config >/dev/null 2>&1
	ret=$?
	if [ $ret -ne 0 ]; then
		eerror "${SVCNAME} cannot switch configuration"
		return 1
	fi

	eend 0
}