[haproxy/f22] Rework systemd service and sysconfig file

[rohara]

commit fb571f1d26a03480425a88d659330881d6ec3491
Author: Ryan O'Hara <rohara at redhat.com>
Date:   Wed Mar 4 15:24:54 2015 -0600

    Rework systemd service and sysconfig file

 haproxy.service   | 2 +-
 haproxy.spec      | 5 ++++-
 haproxy.sysconfig | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/haproxy.service b/haproxy.service
index 5a3585a..c1852bd 100644
--- a/haproxy.service
+++ b/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]
diff --git a/haproxy.spec b/haproxy.spec
index 1446965..6ed65d0 100644
--- a/haproxy.spec
+++ b/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 at redhat.com> - 1.5.11-4
+- Rework systemd service and sysconfig file
+
 * Wed Feb 11 2015 Ryan O'Hara <rohara at redhat.com> - 1.5.11-3
 - Add sysconfig file
 
diff --git a/haproxy.sysconfig b/haproxy.sysconfig
index 7c66885..2b38e35 100644
--- a/haproxy.sysconfig
+++ b/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=""