Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/haproxy/files: haproxy.initd digest-haproxy-1.3.13 digest-haproxy-1.2.16 digest-haproxy-1.3.11.4
Date: Sat, 27 Oct 2007 10:42:40
Message-Id: E1Ilj7g-0004aD-Mm@stork.gentoo.org
1 mrness 07/10/27 10:42:32
2
3 Modified: haproxy.initd
4 Added: digest-haproxy-1.3.13
5 Removed: digest-haproxy-1.2.16 digest-haproxy-1.3.11.4
6 Log:
7 Version bump; add reload init script option (#197202).
8 (Portage version: 2.1.3.9)
9
10 Revision Changes Path
11 1.3 net-proxy/haproxy/files/haproxy.initd
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/haproxy/files/haproxy.initd?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/haproxy/files/haproxy.initd?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/haproxy/files/haproxy.initd?r1=1.2&r2=1.3
16
17 Index: haproxy.initd
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- haproxy.initd 30 Mar 2007 08:47:21 -0000 1.2
24 +++ haproxy.initd 27 Oct 2007 10:42:32 -0000 1.3
25 @@ -1,14 +1,19 @@
26 #!/sbin/runscript
27 # Copyright 1999-2006 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.2 2007/03/30 08:47:21 mrness Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.3 2007/10/27 10:42:32 mrness Exp $
31 +
32 +opts="${opts} reload"
33 +
34 +CONFFILE=/etc/${SVCNAME}.cfg
35 +PIDFILE=/var/run/${SVCNAME}.pid
36
37 checkconfig() {
38 - if [ ! -f /etc/haproxy.cfg ]; then
39 - eerror "/etc/haproxy.cfg does not exist!"
40 + if [ ! -f "${CONFFILE}" ]; then
41 + eerror "${CONFFILE} does not exist!"
42 return 1
43 fi
44 - /usr/bin/haproxy -c -f /etc/haproxy.cfg >/dev/null
45 + /usr/bin/haproxy -c -f "${CONFFILE}" >/dev/null
46 }
47
48 depend() {
49 @@ -19,15 +24,21 @@
50 start() {
51 checkconfig || return 1
52
53 - ebegin "Starting haproxy"
54 + ebegin "Starting ${SVCNAME}"
55 start-stop-daemon --start --quiet \
56 --exec /usr/bin/haproxy \
57 - -- -D -p /var/run/haproxy.pid -f /etc/haproxy.cfg
58 + -- -D -p "${PIDFILE}" -f "${CONFFILE}"
59 eend ${?}
60 }
61
62 stop() {
63 - ebegin "Stopping haproxy"
64 - start-stop-daemon --stop --quiet --pidfile /var/run/haproxy.pid
65 + ebegin "Stopping ${SVCNAME}"
66 + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
67 + eend ${?}
68 +}
69 +
70 +reload() {
71 + ebegin "Reloading ${SVCNAME}"
72 + /usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
73 eend ${?}
74 }
75
76
77
78 1.1 net-proxy/haproxy/files/digest-haproxy-1.3.13
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/haproxy/files/digest-haproxy-1.3.13?rev=1.1&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/haproxy/files/digest-haproxy-1.3.13?rev=1.1&content-type=text/plain
82
83 Index: digest-haproxy-1.3.13
84 ===================================================================
85 MD5 a4c8eac779ff2f8716ba7afda826b9fc haproxy-1.3.13.tar.gz 387175
86 RMD160 1b7b6dfc652352882c990b379953fba713759871 haproxy-1.3.13.tar.gz 387175
87 SHA256 11ff8012a7a720f3c4eec39337f7449a1e22a25f3cf5f565b75733607b8c55e7 haproxy-1.3.13.tar.gz 387175
88
89
90
91 --
92 gentoo-commits@g.o mailing list