diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-08-24 09:35:56 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-08-16 12:50:06 +0000 |
commit | ef4d70929c7b687a7b974e9ae438f6b8a164f16f (patch) | |
tree | 6041f94bf7a848bc2f26bf98f021ecf3456cab55 | |
parent | 4bbb93d659452066ebe032015d4ccdbbc9f57abb (diff) | |
download | alpine_aports-ef4d70929c7b687a7b974e9ae438f6b8a164f16f.tar.bz2 alpine_aports-ef4d70929c7b687a7b974e9ae438f6b8a164f16f.tar.xz alpine_aports-ef4d70929c7b687a7b974e9ae438f6b8a164f16f.zip |
main/haproxy: move default config location
- move default config location to /etc/haproxy/
- provide install/upgrade script that moves existing config to new
location
- provide dummy config
- create haproxy user and group
-rw-r--r-- | main/haproxy/APKBUILD | 14 | ||||
-rw-r--r-- | main/haproxy/haproxy.cfg | 13 | ||||
-rw-r--r-- | main/haproxy/haproxy.initd | 2 | ||||
l--------- | main/haproxy/haproxy.pre-install | 1 | ||||
-rw-r--r-- | main/haproxy/haproxy.pre-upgrade | 12 |
5 files changed, 36 insertions, 6 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 1889a5930f..2b7f820cf6 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD | |||
@@ -2,17 +2,18 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=haproxy | 3 | pkgname=haproxy |
4 | pkgver=1.4.22 | 4 | pkgver=1.4.22 |
5 | pkgrel=0 | 5 | pkgrel=1 |
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" |
9 | license="GPL" | 9 | license="GPL" |
10 | depends="" | 10 | depends="" |
11 | makedepends="pcre-dev" | 11 | makedepends="pcre-dev" |
12 | install= | 12 | install="haproxy.pre-install haproxy.pre-upgrade" |
13 | subpackages="$pkgname-doc" | 13 | subpackages="$pkgname-doc" |
14 | source="http://haproxy.1wt.eu/download/1.4/src/$pkgname-$pkgver.tar.gz | 14 | source="http://haproxy.1wt.eu/download/${pkgver%.*}/src/$pkgname-$pkgver.tar.gz |
15 | haproxy.initd" | 15 | haproxy.initd |
16 | haproxy.cfg" | ||
16 | 17 | ||
17 | build() { | 18 | build() { |
18 | cd "$srcdir/$pkgname-$pkgver" | 19 | cd "$srcdir/$pkgname-$pkgver" |
@@ -23,8 +24,11 @@ package() { | |||
23 | cd "$srcdir/$pkgname-$pkgver" | 24 | cd "$srcdir/$pkgname-$pkgver" |
24 | make DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy \ | 25 | make DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy \ |
25 | install | 26 | install |
27 | install -d "$pkgdir"/usr/share/haproxy | ||
26 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 28 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
29 | install -m644 -D "$srcdir"/haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg | ||
27 | } | 30 | } |
28 | 31 | ||
29 | md5sums="a0b007c76f6a78524f3b3dd5e704979c haproxy-1.4.22.tar.gz | 32 | md5sums="a0b007c76f6a78524f3b3dd5e704979c haproxy-1.4.22.tar.gz |
30 | 0891c7f7b98899b7e7bf767ae92b652e haproxy.initd" | 33 | 81319456a35408bf47443e9c314d2e94 haproxy.initd |
34 | f043f27db8081ee135fb452920405c51 haproxy.cfg" | ||
diff --git a/main/haproxy/haproxy.cfg b/main/haproxy/haproxy.cfg new file mode 100644 index 0000000000..38f4625bbd --- /dev/null +++ b/main/haproxy/haproxy.cfg | |||
@@ -0,0 +1,13 @@ | |||
1 | # dummy config | ||
2 | global | ||
3 | user haproxy | ||
4 | group haproxy | ||
5 | chroot /usr/share/haproxy | ||
6 | daemon | ||
7 | |||
8 | defaults | ||
9 | contimeout 5000 | ||
10 | clitimeout 50000 | ||
11 | |||
12 | listen dummy1 127.0.0.1:10001 | ||
13 | |||
diff --git a/main/haproxy/haproxy.initd b/main/haproxy/haproxy.initd index 3d48ab96eb..fb1d70ed81 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=${HAPROXY_CONF:-/etc/${SVCNAME}.cfg} | 10 | CONFFILE=${HAPROXY_CONF:-/etc/haproxy/${SVCNAME}.cfg} |
11 | PIDFILE=/var/run/${SVCNAME}.pid | 11 | PIDFILE=/var/run/${SVCNAME}.pid |
12 | 12 | ||
13 | depend() { | 13 | depend() { |
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install new file mode 120000 index 0000000000..a5f553dcf0 --- /dev/null +++ b/main/haproxy/haproxy.pre-install | |||
@@ -0,0 +1 @@ | |||
haproxy.pre-upgrade \ No newline at end of file | |||
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade new file mode 100644 index 0000000000..fa9083dc41 --- /dev/null +++ b/main/haproxy/haproxy.pre-upgrade | |||
@@ -0,0 +1,12 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | addgroup haproxy 2>/dev/null | ||
4 | adduser -S -H -h /usr/share/haproxy -s /bin/false -D \ | ||
5 | -G haproxy haproxy 2>/dev/null | ||
6 | |||
7 | # move config to new location | ||
8 | if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then | ||
9 | mkdir -p /etc/haproxy | ||
10 | mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg | ||
11 | fi | ||
12 | |||