Rework systemd service and sysconfig file

haproxy.service

@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/haproxy
-ExecStart=/usr/sbin/haproxy-systemd-wrapper $HAPROXY_OPTIONS
+ExecStart=/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid $OPTIONS
 ExecReload=/bin/kill -USR2 $MAINPID
 
 [Install]

haproxy.spec

@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        1.5.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -144,6 +144,9 @@ exit 0
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Wed Mar 04 2015 Ryan O'Hara <rohara@redhat.com> - 1.5.11-4
+- Rework systemd service and sysconfig file
+
 * Wed Feb 11 2015 Ryan O'Hara <rohara@redhat.com> - 1.5.11-3
 - Add sysconfig file
 

haproxy.sysconfig

@@ -1 +1,4 @@
-HAPROXY_OPTIONS="-f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid"
+# Add extra options to the haproxy daemon here. This can be useful for
+# specifying multiple configuration files with multiple -f options.
+# See haproxy(1) for a complete list of options.
+OPTIONS=""