From 9def1425ce5c8c1db6589795cb171986d2a028a3 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Mon, 26 Jul 2021 11:03:54 +0200 Subject: [PATCH] BUG/MINOR: systemd: must check the configuration using -Ws When doing a reload with a configuration which requires the master-worker mode, the configuration check will fail because the check is not done with -W/-Ws. Example: wla@kikyo:~/haproxy$ ./haproxy -Ws -c -f haproxy.cfg Configuration file is valid wla@kikyo:~/haproxy$ ./haproxy -c -f haproxy.cfg [NOTICE] (13153) : haproxy version is 2.5-dev2-4567b3-16 [NOTICE] (13153) : path to executable is ./haproxy [ALERT] (13153) : config : Can't use a 'program' section without master worker mode. [ALERT] (13153) : config : Fatal errors found in configuration. This patch fixes the issue by adding -Ws on the check command line. Must be backported in all stable branches. (The file was previously in contrib/systemd/haproxy.service.in). --- admin/systemd/haproxy.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/systemd/haproxy.service.in b/admin/systemd/haproxy.service.in index 05fc595796..cb7bbda6cc 100644 --- a/admin/systemd/haproxy.service.in +++ b/admin/systemd/haproxy.service.in @@ -9,7 +9,7 @@ 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 -ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS +ExecReload=@SBINDIR@/haproxy -Ws -f $CONFIG -c -q $EXTRAOPTS ExecReload=/bin/kill -USR2 $MAINPID KillMode=mixed Restart=always -- 2.39.5