From 2836e773760085b85aaaa7e42fe470bcdcfd7dd6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 4 May 2012 06:33:06 +0000
Subject: main/haproxy: fix init.d script

fixes #1120
(cherry picked from commit 73ff75dc2cad984f4bb65267e6637ccb0aa3ae02)
---
 main/haproxy/APKBUILD      | 4 ++--
 main/haproxy/haproxy.initd | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'main/haproxy')

diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 6e3104ec0..9aee06943 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=2
+pkgrel=3
 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
-5903abc9e74923150c73c2eb6dad6b0c  haproxy.initd"
+572195d08dbb1c198b8edade46681b49  haproxy.initd"
diff --git a/main/haproxy/haproxy.initd b/main/haproxy/haproxy.initd
index f96931b18..7855afa04 100644
--- a/main/haproxy/haproxy.initd
+++ b/main/haproxy/haproxy.initd
@@ -5,6 +5,7 @@
 
 extra_commands="checkconfig"
 extra_started_commands="reload"
+command=/usr/sbin/haproxy
 
 CONFFILE=/etc/${SVCNAME}.cfg
 PIDFILE=/var/run/${SVCNAME}.pid
@@ -22,13 +23,13 @@ checkconfig() {
 	fi
 
 	ebegin "Checking ${CONFFILE}"
-	/usr/bin/haproxy -q -c -f "${CONFFILE}"
+	$command -q -c -f "${CONFFILE}"
 	eend $?
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --pidfile "${PIDFILE}" --exec /usr/bin/haproxy \
+	start-stop-daemon --pidfile "${PIDFILE}" --exec $command \
 		--start -- -D -p "${PIDFILE}" -f "${CONFFILE}"
 	eend $?
 }
@@ -47,6 +48,7 @@ stop() {
 reload() {
 	ebegin "Reloading ${SVCNAME}"
 	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
-	/usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
+	$command -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
 	eend $?
 }
+
-- 
cgit v1.2.3