From: William Lallemand <wlallemand@haproxy.org>
Date: Fri, 20 Aug 2021 21:36:45 +0000 (+0200)
Subject: MINOR: systemd: remove the ExecStartPre line in the unit file
X-Git-Tag: v2.5-dev5~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff1e583aa86551f88b95bbe7ca9960304d1632d;p=thirdparty%2Fhaproxy.git

MINOR: systemd: remove the ExecStartPre line in the unit file

The ExecStartPre line was introduced a long time ago in the systemd unit
file, at the time of systemd wrapper. With the haproxy master worker
mode, this line is now useless, since starting haproxy itself will check
the configuration.

However this does not concern the check in the ExecReload which is still
needed to return a reload status to HAProxy.

It probably shouldn't be backported.
---

diff --git a/admin/systemd/haproxy.service.in b/admin/systemd/haproxy.service.in
index 49d3c52cf1..eb1ad428b9 100644
--- a/admin/systemd/haproxy.service.in
+++ b/admin/systemd/haproxy.service.in
@@ -7,7 +7,6 @@ Wants=network-online.target
 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 -Ws -f $CONFIG -c -q $EXTRAOPTS
 ExecStart=@SBINDIR@/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS
 ExecReload=@SBINDIR@/haproxy -Ws -f $CONFIG -c -q $EXTRAOPTS
 ExecReload=/bin/kill -USR2 $MAINPID