Skip to content

Commit

Permalink
Minor cleanup after adding Amazon Linux Support
Browse files Browse the repository at this point in the history
  • Loading branch information
DBezemer committed Mar 17, 2018
1 parent 35d2742 commit 1b70e30
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Github All Releases](https://img.shields.io/github/downloads/DBezemer/rpm-haproxy/total.svg)](https://github.com/DBezemer/rpm-haproxy/releases)

# A Recipe for a HAProxy 1.8 stable version RPM on CentOS
# A Recipe for a HAProxy 1.8 stable version RPM on CentOS / RHEL / Amazon Linux

Perform the following on a build box as a regular user.

Expand All @@ -22,7 +22,11 @@ Resulting RPM will be in /opt/rpm-haproxy/rpmbuild/RPMS/

## Credits

Based on the Red Hat 6.4 RPM spec for haproxy 1.4 combined with work done by [@nmilford](https://www.github.com/nmilford) [@resmo](https://www.github.com/resmo) and [@kevholmes](https://www.github.com/kevholmes)
Update to 1.8 contributed by [@khdevel](https://github.com/khdevel)
Based on the Red Hat 6.4 RPM spec for haproxy 1.4 combined with work done by
- [@nmilford](https://www.github.com/nmilford)
- [@resmo](https://www.github.com/resmo)
- [@kevholmes](https://www.github.com/kevholmes)
- Update to 1.8 contributed by [@khdevel](https://github.com/khdevel)
- Amazon Linux support contributed by [@thedoc31](https://github.com/thedoc31)

Additional logging added based on https://www.percona.com/blog/2014/10/03/haproxy-give-me-some-logs-on-centos-6-5/
11 changes: 7 additions & 4 deletions SPECS/haproxy.spec
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,7 @@ fi
%dir %{_localstatedir}/log/%{name}

%attr(0755,root,root) %{_sbindir}/%{name}
%if 0%{?amzn1}
%attr(0755,root,root) %config %_sysconfdir/rc.d/init.d/%{name}
%endif
%if 0%{?el6}
%if 0%{?el6} || 0%{?amzn1}
%attr(0755,root,root) %config %_sysconfdir/rc.d/init.d/%{name}
%endif
%if 0%{?el7}
Expand All @@ -179,6 +176,12 @@ fi
* Fri Feb 23 2018 J. Casalino <[email protected]>
- Add support for Amazon Linux (Fedora-based)

* Mon Feb 12 2018 David Bezemer <[email protected]>
- Update to HAproxy 1.8.4

* Fri Jan 26 2018 Kamil Herbik <[email protected]>
- Update for HAproxy 1.8

* Mon Jul 31 2017 David Bezemer <[email protected]>
- Update for HAproxy 1.7.8

Expand Down

0 comments on commit 1b70e30

Please sign in to comment.