From: Tim Duesterhus Date: Mon, 6 May 2019 11:00:53 +0000 (+0200) Subject: MINOR: systemd: Make use of master socket in systemd unit X-Git-Tag: v2.0-dev3~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaa4b8a9680568646ed30f892e10a9b190c13d3f;p=thirdparty%2Fhaproxy.git MINOR: systemd: Make use of master socket in systemd unit Unless the EXTRAOPTS variable is overriden in /etc/default/haproxy the unit file will use the master socket by default. This patch may be backported to 1.9 and depends on MINOR: systemd: Use the variables from /etc/default/haproxy. --- diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in index 1387012236..44c369cfd9 100644 --- a/contrib/systemd/haproxy.service.in +++ b/contrib/systemd/haproxy.service.in @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/default/haproxy -Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" +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 ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS