From e0e30f945847a4a2cc69dd1c4661d07f834778db Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 3 Jun 2022 16:44:53 -0500
Subject: [PATCH] Add conf.d directory and update systemd unit file (#2093483)

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

diff --git a/haproxy.service b/haproxy.service
index e128edf..a5524de 100644
--- a/haproxy.service
+++ b/haproxy.service
@@ -5,10 +5,10 @@ Wants=network-online.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/haproxy
-Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid"
-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
+Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "CFGDIR=/etc/haproxy/conf.d"
+ExecStartPre=/usr/sbin/haproxy -f $CONFIG -f $CFGDIR -c -q $OPTIONS
+ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -f $CFGDIR -p $PIDFILE $OPTIONS
+ExecReload=/usr/sbin/haproxy -f $CONFIG -f $CFGDIR -c -q $OPTIONS
 ExecReload=/bin/kill -USR2 $MAINPID
 KillMode=mixed
 SuccessExitStatus=143
diff --git a/haproxy.spec b/haproxy.spec
index 34cb162..2f326cf 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 License:        GPLv2+
@@ -74,6 +74,7 @@ popd
 %{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1
 %{__install} -d -m 0755 %{buildroot}%{haproxy_homedir}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
+%{__install} -d -m 0755 %{buildroot}%{haproxy_confdir}/conf.d
 %{__install} -d -m 0755 %{buildroot}%{_bindir}
 %{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog
 %{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange
@@ -118,6 +119,7 @@ exit 0
 %license LICENSE
 %dir %{haproxy_homedir}
 %dir %{haproxy_confdir}
+%dir %{haproxy_confdir}/conf.d
 %dir %{haproxy_datadir}
 %{haproxy_datadir}/*
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
@@ -131,6 +133,9 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 03 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.0-2
+- Add conf.d directory and update systemd unit file (#2093483)
+
 * Fri Jun 03 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.0-1
 - Update to 2.6.0 (#2092069)