diff options
| author |   Bertrand Jacquin <bertrand@jacquin.bzh> | 2016-10-05 22:10:17 +0100 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-10-15 16:52:33 +0200 |
| commit | 2bfe6e3f45c9c3a26b44bdceaff67839504a19de (patch) | |
| tree | 4ba5c00147aabaed4931e02d030e330870273e83 /net-proxy/haproxy/files | |
| parent | app-dicts/qvortaro: Remove references to berlios.de (diff) | |
| download | gentoo-2bfe6e3f45c9c3a26b44bdceaff67839504a19de.tar.gz gentoo-2bfe6e3f45c9c3a26b44bdceaff67839504a19de.tar.bz2 gentoo-2bfe6e3f45c9c3a26b44bdceaff67839504a19de.zip | |
net-proxy/haproxy: major improvements.
* Move to /run.
* Remove commented USE_LINUX_SPLICE since declaration is implicit.
* Remove commented USE_LINUX_TPROXY since declaration is implicit.
* Keep lua for live ebuild.
Gentoo-Bug: https://bugs.gentoo.org/332633
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2486
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-proxy/haproxy/files')
| -rw-r--r-- | net-proxy/haproxy/files/haproxy.confd | 4 | ||||
| -rw-r--r-- | net-proxy/haproxy/files/haproxy.initd-r2 | 4 | ||||
| -rw-r--r-- | net-proxy/haproxy/files/haproxy.initd-r3 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net-proxy/haproxy/files/haproxy.confd b/net-proxy/haproxy/files/haproxy.confd index 5a989a776749..30739eb8bf23 100644 --- a/net-proxy/haproxy/files/haproxy.confd +++ b/net-proxy/haproxy/files/haproxy.confd @@ -9,6 +9,6 @@ HAPROXY_OPTS="" # For more information on how to use that feature please have a look at the # "seamless_reload.txt" documentation file (requires net-proxy/haproxy[examples]) #reload_seamless() { -# checkpath -d -m 0700 haproxy:haproxy "/var/run/haproxy/" -# socat /var/run/haproxy/socket - <<< "show servers state" > /var/run/haproxy/global.state +# checkpath -d -m 0700 haproxy:haproxy "/run/haproxy/" +# socat /run/haproxy/socket - <<< "show servers state" > /run/haproxy/global.state #} diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2 index 39a5bb457bd4..15c5eb5b08c6 100644 --- a/net-proxy/haproxy/files/haproxy.initd-r2 +++ b/net-proxy/haproxy/files/haproxy.initd-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,7 +7,7 @@ extra_commands="checkconfig" extra_started_commands="reload" command="/usr/bin/haproxy" -pidfile="/var/run/${SVCNAME}.pid" +pidfile="/run/${SVCNAME}.pid" if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then CONFFILE=/etc/haproxy/${SVCNAME}.cfg diff --git a/net-proxy/haproxy/files/haproxy.initd-r3 b/net-proxy/haproxy/files/haproxy.initd-r3 index 92665cd25464..60ec31ac376b 100644 --- a/net-proxy/haproxy/files/haproxy.initd-r3 +++ b/net-proxy/haproxy/files/haproxy.initd-r3 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ extra_started_commands="reload" command="/usr/bin/haproxy" -pidfile="${HAPROXY_PIDFILE:-/var/run/${SVCNAME}.pid}" +pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}" configs= |