From fcc6a1e573ad9f42e1aea8c0c5d802f88d0755a4 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Mon, 20 Nov 2017 21:58:07 +0100 Subject: www-servers/varnish: remove unused files Signed-off-by: Anthony G. Basile --- www-servers/varnish/files/varnishd.confd-r3 | 22 -------- www-servers/varnish/files/varnishd.initd-r3 | 77 -------------------------- www-servers/varnish/files/varnishncsa.initd-r1 | 44 --------------- 3 files changed, 143 deletions(-) delete mode 100644 www-servers/varnish/files/varnishd.confd-r3 delete mode 100644 www-servers/varnish/files/varnishd.initd-r3 delete mode 100644 www-servers/varnish/files/varnishncsa.initd-r1 diff --git a/www-servers/varnish/files/varnishd.confd-r3 b/www-servers/varnish/files/varnishd.confd-r3 deleted file mode 100644 index c05b8fb7521c..000000000000 --- a/www-servers/varnish/files/varnishd.confd-r3 +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/conf.d/varnishd - -VARNISHD="/usr/sbin/varnishd" -VARNISHADM="/usr/bin/varnishadm" - -#CONFIGFILES="/etc/varnish/${SVCNAME}.vcl" -CONFIGFILE="/etc/varnish/default.vcl" - -# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80 -#VARNISHD_OPTS="-a 127.0.0.1:8080 -a 127.0.0.1:8080" - -# Alternatively, don't listen to a backend -VARNISHD_OPTS="-a 127.0.0.1:8080" - - -# User/Group -VARNISHD_OPTS="${VARNISHD_OPTS} -u varnish -g varnish" - -# You may 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" diff --git a/www-servers/varnish/files/varnishd.initd-r3 b/www-servers/varnish/files/varnishd.initd-r3 deleted file mode 100644 index ff8eaf691ea3..000000000000 --- a/www-servers/varnish/files/varnishd.initd-r3 +++ /dev/null @@ -1,77 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VARNISHD_PID=${VARNISHD_PID:-/run/${SVCNAME}.pid} -CONFIGFILES="${CONFIGFILE:-/etc/varnish/default.vcl}" - -command="${VARNISHD:-/usr/sbin/varnishd}" -command_args="-P ${VARNISHD_PID} -f ${CONFIGFILE} ${VARNISHD_OPTS}" -pidfile="${VARNISHD_PID}" - -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_pre() { - checkconfig || return 1 -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - checkconfig || return 1 - 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 -} diff --git a/www-servers/varnish/files/varnishncsa.initd-r1 b/www-servers/varnish/files/varnishncsa.initd-r1 deleted file mode 100644 index 8a584decc965..000000000000 --- a/www-servers/varnish/files/varnishncsa.initd-r1 +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VARNISHNCSA_PID=${VARNISHNCSA_PID:-/run/${SVCNAME}.pid} - -command="${VARNISHNCSA:-/usr/bin/varnishncsa}" -command_args="-D -P ${VARNISHNCSA_PID} ${VARNISHNCSA_OPTS}" -pidfile="${VARNISHNCSA_PID}" - -extra_started_commands="reload rotate flush" - -description_rotate="Rotate the log file" -description_flush="Flush any outstanding transactions" - -# We need to make sure varnishd has started first, bug #524284 -start_pre() { - TIMEOUT=${TIMEOUT:-5} - - local i=0 - while [ $i -lt ${TIMEOUT} ]; do - echo status | varnishadm 2>/dev/null | grep -q "Child in state running" - test $? -eq 0 && break - - sleep 1 && i=$(expr $i + 1) - done -} - -rotate() { - ebegin "Rotating log file" - start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGHUP - eend $? -} - -flush() { - ebegin "Flushing any outstanding transactions" - start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGUSR1 - eend $? -} - -reload() { - flush - rotate -} -- cgit v1.2.3-65-gdbad