diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-08-24 08:34:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-08-16 12:50:06 +0000 |
| commit | 46a35a60f530a6dc385c5f2d9fb91b8e2c7b41c3 (patch) | |
| tree | db5d3d4be169ff32fda7e5cce4b3f2e37ba5ace5 | |
| parent | 39fe9fe32eab1af8d3bbfd40ded256f4d3df674a (diff) | |
| download | alpine_aports-46a35a60f530a6dc385c5f2d9fb91b8e2c7b41c3.tar.bz2 alpine_aports-46a35a60f530a6dc385c5f2d9fb91b8e2c7b41c3.tar.xz alpine_aports-46a35a60f530a6dc385c5f2d9fb91b8e2c7b41c3.zip | |
main/haproxy: allow user override config file location
Use HAPROXY_CONF=/etc/mylocation.cfg in /etc/conf.d/haproxy
ref #1339
| -rw-r--r-- | main/haproxy/APKBUILD | 4 | ||||
| -rw-r--r-- | main/haproxy/haproxy.initd | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 9aee069430..344d39e765 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
| 3 | pkgname=haproxy | 3 | pkgname=haproxy |
| 4 | pkgver=1.4.18 | 4 | pkgver=1.4.18 |
| 5 | pkgrel=3 | 5 | pkgrel=4 |
| 6 | pkgdesc="A TCP/HTTP reverse proxy for high availability environments" | 6 | pkgdesc="A TCP/HTTP reverse proxy for high availability environments" |
| 7 | url="http://haproxy.1wt.eu" | 7 | url="http://haproxy.1wt.eu" |
| 8 | arch="all" | 8 | arch="all" |
| @@ -27,4 +27,4 @@ package() { | |||
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | md5sums="4ac88bb1a76c4b84ed4f6131183bedbe haproxy-1.4.18.tar.gz | 29 | md5sums="4ac88bb1a76c4b84ed4f6131183bedbe haproxy-1.4.18.tar.gz |
| 30 | 572195d08dbb1c198b8edade46681b49 haproxy.initd" | 30 | 0891c7f7b98899b7e7bf767ae92b652e haproxy.initd" |
diff --git a/main/haproxy/haproxy.initd b/main/haproxy/haproxy.initd index 7855afa043..3d48ab96eb 100644 --- a/main/haproxy/haproxy.initd +++ b/main/haproxy/haproxy.initd | |||
| @@ -7,7 +7,7 @@ extra_commands="checkconfig" | |||
| 7 | extra_started_commands="reload" | 7 | extra_started_commands="reload" |
| 8 | command=/usr/sbin/haproxy | 8 | command=/usr/sbin/haproxy |
| 9 | 9 | ||
| 10 | CONFFILE=/etc/${SVCNAME}.cfg | 10 | CONFFILE=${HAPROXY_CONF:-/etc/${SVCNAME}.cfg} |
| 11 | PIDFILE=/var/run/${SVCNAME}.pid | 11 | PIDFILE=/var/run/${SVCNAME}.pid |
| 12 | 12 | ||
| 13 | depend() { | 13 | depend() { |