diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-19 09:24:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-19 09:48:14 +0000 |
| commit | f7e41e3ec0761800bdda53a43c44cdb028703d06 (patch) | |
| tree | f5199e175715f68aba1f207857366ea16e62d83b /main | |
| parent | 8d2184c1e4e59e117bc917676e29be130e128f53 (diff) | |
| download | aports-f7e41e3ec0761800bdda53a43c44cdb028703d06.tar.bz2 aports-f7e41e3ec0761800bdda53a43c44cdb028703d06.tar.xz | |
main/haproxy: update init.d script
use a new copy of gentoo init.d script
ref #943
Diffstat (limited to 'main')
| -rw-r--r-- | main/haproxy/APKBUILD | 4 | ||||
| -rw-r--r-- | main/haproxy/haproxy.initd | 45 |
2 files changed, 28 insertions, 21 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 97a546fd7..6945f6650 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=haproxy pkgver=1.4.18 -pkgrel=0 +pkgrel=1 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" url="http://haproxy.1wt.eu" arch="all" @@ -27,4 +27,4 @@ package() { } md5sums="4ac88bb1a76c4b84ed4f6131183bedbe haproxy-1.4.18.tar.gz -cce88addaac6ee8065633b94c404300d haproxy.initd" +5903abc9e74923150c73c2eb6dad6b0c haproxy.initd" diff --git a/main/haproxy/haproxy.initd b/main/haproxy/haproxy.initd index 68b7e0fef..f96931b18 100644 --- a/main/haproxy/haproxy.initd +++ b/main/haproxy/haproxy.initd @@ -1,45 +1,52 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.3 2007/10/27 10:42:32 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r1,v 1.2 2011/12/04 10:32:32 swegener Exp $ -opts="${opts} reload" +extra_commands="checkconfig" +extra_started_commands="reload" CONFFILE=/etc/${SVCNAME}.cfg PIDFILE=/var/run/${SVCNAME}.pid +depend() { + need net + after firewall + use dns logger +} + checkconfig() { if [ ! -f "${CONFFILE}" ]; then eerror "${CONFFILE} does not exist!" return 1 fi - /usr/sbin/haproxy -c -f "${CONFFILE}" >/dev/null -} -depend() { - need net - after firewall - use dns logger + ebegin "Checking ${CONFFILE}" + /usr/bin/haproxy -q -c -f "${CONFFILE}" + eend $? } start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet \ - --exec /usr/sbin/haproxy \ - -- -D -p "${PIDFILE}" -f "${CONFFILE}" - eend ${?} + start-stop-daemon --pidfile "${PIDFILE}" --exec /usr/bin/haproxy \ + --start -- -D -p "${PIDFILE}" -f "${CONFFILE}" + eend $? } stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend ${?} + + if [ "${RC_CMD}" = "restart" ]; then + checkconfig || return 1 + fi + + start-stop-daemon --stop --pidfile "${PIDFILE}" + eend $? } reload() { ebegin "Reloading ${SVCNAME}" - /usr/sbin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}") - eend ${?} + checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; } + /usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}") + eend $? } |