X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by lists.alpinelinux.org (Postfix) with ESMTP id 9CFF01EBFF5 for ; Sat, 22 Jan 2011 18:52:11 +0000 (UTC) Received: by qyk36 with SMTP id 36so2740373qyk.13 for ; Sat, 22 Jan 2011 10:52:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=BAEEYxO0GrZzaMEKDD3WISmueGbPJAXRLKHPj0vU7E0=; b=BKdHIex+Oxd/QVGSKhi4ojRKunPFh1RAnd+VUvmggudyduDReLZk/1JJ59NumV3k47 Z7X4knodocQRCDcLMvqkc++Bp81v25jkEpnx1a80Uo6aOVhtvM+dKy7MA075ii6C04IY BWosJXx9UcIDQzV60NKf+cVCg9baG8wTKPvH8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Bxd8OkHuM5jxnYo6zX2zsxyG4B9M0QLjMGdcpluq8n9WqQgBsNxF4ULECiX/LfqBs9 OKqo0Zpmqfi/2HsPgnhVLKoxNzP2ayj8nS9kMdgqmTiLvkbRTTl4L1jzkdh4fdIrG7h3 s3+weI6R20M4l1K+Dy/iP9WgK3Kp9OXqZlZsU= Received: by 10.224.89.81 with SMTP id d17mr2103781qam.332.1295722329341; Sat, 22 Jan 2011 10:52:09 -0800 (PST) Received: from localhost.localdomain (209.250.132.162.tor.pathcom.com [209.250.132.162]) by mx.google.com with ESMTPS id g32sm7725936qck.34.2011.01.22.10.52.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 Jan 2011 10:52:08 -0800 (PST) From: Jeff Bilyk To: alpine-devel@lists.alpinelinux.org Cc: Jeff Bilyk Subject: [alpine-devel] [PATCH] testing/haproxy: fixed init script, updated contributor Date: Sat, 22 Jan 2011 18:51:57 +0000 Message-Id: <1295722317-1802-1-git-send-email-jbilyk@gmail.com> X-Mailer: git-send-email 1.7.3.5 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Fixed init script to point to proper path to haproxy and updated contributor --- testing/haproxy/APKBUILD | 6 +++--- testing/haproxy/haproxy.initd | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/haproxy/APKBUILD b/testing/haproxy/APKBUILD index 4c09b15..9f8355d 100644 --- a/testing/haproxy/APKBUILD +++ b/testing/haproxy/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Michael Mason +# Contributor: Jeff Bilyk # Maintainer: Michael Mason pkgname=haproxy pkgver=1.4.10 -pkgrel=0 +pkgrel=1 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" url="http://haproxy.1wt.eu" arch="all" @@ -26,4 +26,4 @@ package() { } md5sums="c35a7b7820d6da6c34cfd952805b4e85 haproxy-1.4.10.tar.gz -7d26095c6f899b0ef00bedecaca58864 haproxy.initd" +cce88addaac6ee8065633b94c404300d haproxy.initd" diff --git a/testing/haproxy/haproxy.initd b/testing/haproxy/haproxy.initd index 82a1067..68b7e0f 100644 --- a/testing/haproxy/haproxy.initd +++ b/testing/haproxy/haproxy.initd @@ -13,7 +13,7 @@ checkconfig() { eerror "${CONFFILE} does not exist!" return 1 fi - /usr/bin/haproxy -c -f "${CONFFILE}" >/dev/null + /usr/sbin/haproxy -c -f "${CONFFILE}" >/dev/null } depend() { @@ -27,7 +27,7 @@ start() { ebegin "Starting ${SVCNAME}" start-stop-daemon --start --quiet \ - --exec /usr/bin/haproxy \ + --exec /usr/sbin/haproxy \ -- -D -p "${PIDFILE}" -f "${CONFFILE}" eend ${?} } @@ -40,6 +40,6 @@ stop() { reload() { ebegin "Reloading ${SVCNAME}" - /usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}") + /usr/sbin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}") eend ${?} } -- 1.7.3.5 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---