From 408bd115c3489a79df1619ab7a6c9e5f4b4cc5d9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 01:25:19 +0000
Subject: import haproxy-1.8.23-5.el8


---

diff --git a/SOURCES/haproxy.service b/SOURCES/haproxy.service
index 2b3a35e..b5beeb4 100644
--- a/SOURCES/haproxy.service
+++ b/SOURCES/haproxy.service
@@ -1,12 +1,14 @@
 [Unit]
 Description=HAProxy Load Balancer
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid"
-ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q
-ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE
-ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q
+EnvironmentFile=/etc/sysconfig/haproxy
+ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q $OPTIONS
+ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $OPTIONS
+ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q $OPTIONS
 ExecReload=/bin/kill -USR2 $MAINPID
 SuccessExitStatus=143
 KillMode=mixed
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
index fe10158..8a342f8 100644
--- a/SPECS/haproxy.spec
+++ b/SPECS/haproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        1.8.23
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -140,6 +140,12 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jun 18 2020 Ryan O'Hara <rohara@redhat.com> - 1.8.23-5
+- Use OPTIONS from systemd EnvironmentFile (#1845611)
+
+* Wed Jun 17 2020 Ryan O'Hara <rohara@redhat.com> - 1.8.23-4
+- Wait for network to be online before starting (#1756714)
+
 * Wed Apr 01 2020 Ryan O'Hara <rohara@redhat.com> - 1.8.23-3
 - Fix hapack zero byte input causing overwrite (CVE-2020-11100, #1819519)