Remove haproxy-systemd-wrapper

This commit is contained in:
Ryan O'Hara 2018-01-05 10:00:24 -06:00
parent dfcbdc82f8
commit 2232e92f86
2 changed files with 7 additions and 4 deletions

View File

@ -1,14 +1,15 @@
[Unit] [Unit]
Description=HAProxy Load Balancer Description=HAProxy Load Balancer
After=syslog.target network.target After=network.target
[Service] [Service]
Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid"
ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q 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=/usr/sbin/haproxy -f $CONFIG -c -q
ExecReload=/bin/kill -USR2 $MAINPID ExecReload=/bin/kill -USR2 $MAINPID
KillMode=mixed KillMode=mixed
Type=notify
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -8,7 +8,7 @@
Name: haproxy Name: haproxy
Version: 1.8.3 Version: 1.8.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: HAProxy reverse proxy for high availability environments Summary: HAProxy reverse proxy for high availability environments
Group: System Environment/Daemons Group: System Environment/Daemons
@ -127,13 +127,15 @@ exit 0
%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_sbindir}/%{name}-systemd-wrapper
%{_bindir}/halog %{_bindir}/halog
%{_bindir}/iprange %{_bindir}/iprange
%{_mandir}/man1/* %{_mandir}/man1/*
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home} %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
%changelog %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 * Fri Jan 05 2018 Ryan O'Hara <rohara@redhat.com> - 1.8.3-1
- Update to 1.8.3 (#1528829) - Update to 1.8.3 (#1528829)