diff --git a/haproxy.service b/haproxy.service index c1852bd..87c382b 100644 --- a/haproxy.service +++ b/haproxy.service @@ -3,9 +3,12 @@ Description=HAProxy Load Balancer After=syslog.target network.target [Service] -EnvironmentFile=/etc/sysconfig/haproxy -ExecStart=/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid $OPTIONS +Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" +ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q +ExecStart=/usr/sbin/haproxy-systemd-wrapper -f $CONFIG -p $PIDFILE +ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q ExecReload=/bin/kill -USR2 $MAINPID +KillMode=mixed [Install] WantedBy=multi-user.target diff --git a/haproxy.spec b/haproxy.spec index bfa9d17..b36f5bd 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HAProxy reverse proxy for high availability environments Group: System Environment/Daemons @@ -139,6 +139,9 @@ exit 0 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home} %changelog +* Mon May 01 2017 Ryan O'Hara - 1.7.3-2 +- Use KillMode=mixed in systemd service file (#1447085) + * Sun Mar 26 2017 Ryan O'Hara - 1.7.3-1 - Update to 1.7.3 (#1413276)