rpms/haproxy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add conf.d directory and update systemd unit file (#2093483)

Browse Source
This commit is contained in:
Ryan O'Hara 2022-06-03 16:44:53 -05:00
parent 5cf3269fd2
commit e0e30f9458
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
haproxy.service
View File

@ -5,10 +5,10 @@ Wants=network-online.target
[Service] [Service]
EnvironmentFile=-/etc/sysconfig/haproxy EnvironmentFile=-/etc/sysconfig/haproxy
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"
ExecStartPre=/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 -p $PIDFILE $OPTIONS ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -f $CFGDIR -p $PIDFILE $OPTIONS
ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q $OPTIONS ExecReload=/usr/sbin/haproxy -f $CONFIG -f $CFGDIR -c -q $OPTIONS
ExecReload=/bin/kill -USR2 $MAINPID ExecReload=/bin/kill -USR2 $MAINPID
KillMode=mixed KillMode=mixed
SuccessExitStatus=143 SuccessExitStatus=143

7
haproxy.spec
View File

@ -8,7 +8,7 @@
Name: haproxy Name: haproxy
Version: 2.6.0 Version: 2.6.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: HAProxy reverse proxy for high availability environments Summary: HAProxy reverse proxy for high availability environments
License: GPLv2+ License: GPLv2+
@ -74,6 +74,7 @@ popd
%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1 %{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1
%{__install} -d -m 0755 %{buildroot}%{haproxy_homedir} %{__install} -d -m 0755 %{buildroot}%{haproxy_homedir}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir} %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
%{__install} -d -m 0755 %{buildroot}%{haproxy_confdir}/conf.d
%{__install} -d -m 0755 %{buildroot}%{_bindir} %{__install} -d -m 0755 %{buildroot}%{_bindir}
%{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog %{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog
%{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange %{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange
@ -118,6 +119,7 @@ exit 0
%license LICENSE %license LICENSE
%dir %{haproxy_homedir} %dir %{haproxy_homedir}
%dir %{haproxy_confdir} %dir %{haproxy_confdir}
%dir %{haproxy_confdir}/conf.d
%dir %{haproxy_datadir} %dir %{haproxy_datadir}
%{haproxy_datadir}/* %{haproxy_datadir}/*
%config(noreplace) %{haproxy_confdir}/%{name}.cfg %config(noreplace) %{haproxy_confdir}/%{name}.cfg
@ -131,6 +133,9 @@ exit 0
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Fri Jun 03 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.0-1
- Update to 2.6.0 (#2092069) - Update to 2.6.0 (#2092069)