diff --git a/SOURCES/haproxy.service b/SOURCES/haproxy.service index b5beeb4..356668d 100644 --- a/SOURCES/haproxy.service +++ b/SOURCES/haproxy.service @@ -4,11 +4,11 @@ After=network-online.target Wants=network-online.target [Service] -Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" +Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "CFGDIR=/etc/haproxy/conf.d" 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 +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 SuccessExitStatus=143 KillMode=mixed diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index 3fe5bd5..c746243 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 1.8.27 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HAProxy reverse proxy for high availability environments Group: System Environment/Daemons @@ -83,6 +83,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 ./contrib/halog/halog %{buildroot}%{_bindir}/halog %{__install} -p -m 0755 ./contrib/iprange/iprange %{buildroot}%{_bindir}/iprange @@ -128,6 +129,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 @@ -140,7 +142,10 @@ exit 0 %{_mandir}/man1/* %changelog -* Tue Jan 18 2022 Ryan O'Hara - 1.8.27-3 +* Fri Jun 03 2022 Ryan O'Hara - 1.8.27-5 +- Add configuration directory and update systemd unit file (#1943869) + +* Tue Jan 18 2022 Ryan O'Hara - 1.8.27-4 - Apply patch (#1941446) * Fri Oct 15 2021 Ryan O'Hara - 1.8.27-3