Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
Date: Mon, 20 Nov 2017 22:54:04
Message-Id: 1511218413.fcc6a1e573ad9f42e1aea8c0c5d802f88d0755a4.blueness@gentoo
1 commit: fcc6a1e573ad9f42e1aea8c0c5d802f88d0755a4
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Nov 20 20:58:07 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 20 22:53:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc6a1e5
7
8 www-servers/varnish: remove unused files
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 www-servers/varnish/files/varnishd.confd-r3 | 22 --------
13 www-servers/varnish/files/varnishd.initd-r3 | 77 --------------------------
14 www-servers/varnish/files/varnishncsa.initd-r1 | 44 ---------------
15 3 files changed, 143 deletions(-)
16
17 diff --git a/www-servers/varnish/files/varnishd.confd-r3 b/www-servers/varnish/files/varnishd.confd-r3
18 deleted file mode 100644
19 index c05b8fb7521..00000000000
20 --- a/www-servers/varnish/files/varnishd.confd-r3
21 +++ /dev/null
22 @@ -1,22 +0,0 @@
23 -# /etc/conf.d/varnishd
24 -
25 -VARNISHD="/usr/sbin/varnishd"
26 -VARNISHADM="/usr/bin/varnishadm"
27 -
28 -#CONFIGFILES="/etc/varnish/${SVCNAME}.vcl"
29 -CONFIGFILE="/etc/varnish/default.vcl"
30 -
31 -# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
32 -#VARNISHD_OPTS="-a 127.0.0.1:8080 -a 127.0.0.1:8080"
33 -
34 -# Alternatively, don't listen to a backend
35 -VARNISHD_OPTS="-a 127.0.0.1:8080"
36 -
37 -
38 -# User/Group
39 -VARNISHD_OPTS="${VARNISHD_OPTS} -u varnish -g varnish"
40 -
41 -# You may need to increase the number of open files (-n)
42 -# and the maximum amount off locked memory (-l)
43 -# See bug #459142
44 -#rc_ulimit="-n 32786 -l 82000"
45
46 diff --git a/www-servers/varnish/files/varnishd.initd-r3 b/www-servers/varnish/files/varnishd.initd-r3
47 deleted file mode 100644
48 index ff8eaf691ea..00000000000
49 --- a/www-servers/varnish/files/varnishd.initd-r3
50 +++ /dev/null
51 @@ -1,77 +0,0 @@
52 -#!/sbin/openrc-run
53 -# Copyright 1999-2014 Gentoo Foundation
54 -# Distributed under the terms of the GNU General Public License v2
55 -
56 -VARNISHD_PID=${VARNISHD_PID:-/run/${SVCNAME}.pid}
57 -CONFIGFILES="${CONFIGFILE:-/etc/varnish/default.vcl}"
58 -
59 -command="${VARNISHD:-/usr/sbin/varnishd}"
60 -command_args="-P ${VARNISHD_PID} -f ${CONFIGFILE} ${VARNISHD_OPTS}"
61 -pidfile="${VARNISHD_PID}"
62 -
63 -extra_commands="configtest"
64 -extra_started_commands="reload"
65 -
66 -description_configtest="Run syntax tests for configuration files."
67 -description_reload="Reloads the configuration."
68 -
69 -depend() {
70 - need net
71 -}
72 -
73 -configtest() {
74 - ebegin "Checking ${SVCNAME} configuration"
75 - checkconfig
76 - eend $?
77 -}
78 -
79 -checkconfig() {
80 - ${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
81 - ret=$?
82 - if [ $ret -ne 0 ]; then
83 - eerror "${SVCNAME} has detected an error in your setup:"
84 - ${VARNISHD} -C -f ${CONFIGFILE}
85 - fi
86 -
87 - return $ret
88 -}
89 -
90 -start_pre() {
91 - checkconfig || return 1
92 -}
93 -
94 -stop_pre() {
95 - if [ "${RC_CMD}" = "restart" ]; then
96 - checkconfig || return 1
97 - fi
98 -}
99 -
100 -reload() {
101 - checkconfig || return 1
102 -
103 - ebegin "Reloading varnish"
104 -
105 - $VARNISHADM vcl.list >/dev/null 2>&1
106 - ret=$?
107 - if [ $ret -ne 0 ]; then
108 - eerror "${SVCNAME} cannot list configuration"
109 - return 1
110 - fi
111 -
112 - new_config="reload_$(date +%FT%H:%M:%S)"
113 - $VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
114 - ret=$?
115 - if [ $ret -ne 0 ]; then
116 - eerror "${SVCNAME} cannot load configuration"
117 - return 1
118 - fi
119 -
120 - $VARNISHADM vcl.use $new_config >/dev/null 2>&1
121 - ret=$?
122 - if [ $ret -ne 0 ]; then
123 - eerror "${SVCNAME} cannot switch configuration"
124 - return 1
125 - fi
126 -
127 - eend 0
128 -}
129
130 diff --git a/www-servers/varnish/files/varnishncsa.initd-r1 b/www-servers/varnish/files/varnishncsa.initd-r1
131 deleted file mode 100644
132 index 8a584decc96..00000000000
133 --- a/www-servers/varnish/files/varnishncsa.initd-r1
134 +++ /dev/null
135 @@ -1,44 +0,0 @@
136 -#!/sbin/openrc-run
137 -# Copyright 1999-2014 Gentoo Foundation
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -VARNISHNCSA_PID=${VARNISHNCSA_PID:-/run/${SVCNAME}.pid}
141 -
142 -command="${VARNISHNCSA:-/usr/bin/varnishncsa}"
143 -command_args="-D -P ${VARNISHNCSA_PID} ${VARNISHNCSA_OPTS}"
144 -pidfile="${VARNISHNCSA_PID}"
145 -
146 -extra_started_commands="reload rotate flush"
147 -
148 -description_rotate="Rotate the log file"
149 -description_flush="Flush any outstanding transactions"
150 -
151 -# We need to make sure varnishd has started first, bug #524284
152 -start_pre() {
153 - TIMEOUT=${TIMEOUT:-5}
154 -
155 - local i=0
156 - while [ $i -lt ${TIMEOUT} ]; do
157 - echo status | varnishadm 2>/dev/null | grep -q "Child in state running"
158 - test $? -eq 0 && break
159 -
160 - sleep 1 && i=$(expr $i + 1)
161 - done
162 -}
163 -
164 -rotate() {
165 - ebegin "Rotating log file"
166 - start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGHUP
167 - eend $?
168 -}
169 -
170 -flush() {
171 - ebegin "Flushing any outstanding transactions"
172 - start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGUSR1
173 - eend $?
174 -}
175 -
176 -reload() {
177 - flush
178 - rotate
179 -}