From 2232e92f867dc211f30046f91febe64aff782da2 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 5 Jan 2018 10:00:24 -0600
Subject: [PATCH] Remove haproxy-systemd-wrapper

---
 haproxy.service | 5 +++--
 haproxy.spec    | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/haproxy.service b/haproxy.service
index 87c382b..b32d00c 100644
--- a/haproxy.service
+++ b/haproxy.service
@@ -1,14 +1,15 @@
 [Unit]
 Description=HAProxy Load Balancer
-After=syslog.target network.target
+After=network.target
 
 [Service]
 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
+ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE
 ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q
 ExecReload=/bin/kill -USR2 $MAINPID
 KillMode=mixed
+Type=notify
 
 [Install]
 WantedBy=multi-user.target
diff --git a/haproxy.spec b/haproxy.spec
index 81ca103..4a0f3a2 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -127,13 +127,15 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_unitdir}/%{name}.service
 %{_sbindir}/%{name}
-%{_sbindir}/%{name}-systemd-wrapper
 %{_bindir}/halog
 %{_bindir}/iprange
 %{_mandir}/man1/*
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Fri Jan 05 2018 Ryan O'Hara <rohara@redhat.com> - 1.8.3-2
+- Remove haproxy-systemd-wrapper
+
 * Fri Jan 05 2018 Ryan O'Hara <rohara@redhat.com> - 1.8.3-1
 - Update to 1.8.3 (#1528829)