From: William Lallemand <wlallemand@haproxy.org>
Date: Tue, 7 May 2019 12:00:33 +0000 (+0200)
Subject: MINOR: systemd: support /etc/sysconfig/ for redhat based distrib
X-Git-Tag: v2.0-dev3~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaa45550032be56c26ba7772599336f66975b06d;p=thirdparty%2Fhaproxy.git

MINOR: systemd: support /etc/sysconfig/ for redhat based distrib

The patch "MINOR: systemd: Make use of master socket in systemd unit"
introduces an environment file in /etc/default.

Unfortunatly this is not supported on redhat-based system, so we add
/etc/sysconfig/haproxy for that.
---

diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in
index 44c369cfd9..9b7c3d1bbc 100644
--- a/contrib/systemd/haproxy.service.in
+++ b/contrib/systemd/haproxy.service.in
@@ -4,6 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/default/haproxy
+EnvironmentFile=-/etc/sysconfig/haproxy
 Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "EXTRAOPTS=-S /run/haproxy-master.sock"
 ExecStartPre=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS
 ExecStart=@SBINDIR@/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS