From fff1e583aa86551f88b95bbe7ca9960304d1632d Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Fri, 20 Aug 2021 23:36:45 +0200 Subject: [PATCH] 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. --- admin/systemd/haproxy.service.in | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/systemd/haproxy.service.in b/admin/systemd/haproxy.service.in index 49d3c52cf..eb1ad428b 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