Browse code
Add haproxy-systemd-wrapper to package, add a default configuration file.
Change-Id: Id8446a9fd579e28527a1014a7a082299fe2245d9
Reviewed-on: http://photon-jenkins.eng.vmware.com/964
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
xiaolin-vmware authored on 2016/05/21 07:31:35Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A fast, reliable HA, load balancing, and proxy solution. |
| 2 | 2 |
Name: haproxy |
| 3 | 3 |
Version: 1.6.3 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: GPL |
| 6 | 6 |
URL: http://www.haproxy.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -11,8 +11,11 @@ Source0: http://www.haproxy.org/download/1.6/src/%{name}-%{version}.tar.g
|
| 11 | 11 |
%define sha1 haproxy=f7da36b53188fa15551978dfbda80a9e1816fa01 |
| 12 | 12 |
BuildRequires: openssl-devel |
| 13 | 13 |
BuildRequires: pcre-devel |
| 14 |
+BuildRequires: lua-devel |
|
| 14 | 15 |
BuildRequires: pkg-config |
| 15 | 16 |
BuildRequires: zlib-devel |
| 17 |
+BuildRequires: systemd |
|
| 18 |
+Requires: systemd |
|
| 16 | 19 |
|
| 17 | 20 |
%description |
| 18 | 21 |
HAProxy is a fast and reliable solution offering high availability, load |
| ... | ... |
@@ -33,17 +36,21 @@ make %{?_smp_mflags} TARGET=linux2628 USE_PCRE=1 USE_OPENSSL=1 \
|
| 33 | 33 |
USE_GETADDRINFO=1 USE_ZLIB=1 |
| 34 | 34 |
make %{?_smp_mflags} -C contrib/systemd
|
| 35 | 35 |
sed -i s/"local\/"/""/g contrib/systemd/haproxy.service |
| 36 |
+sed -i "s/\/run/\/var\/run/g" contrib/systemd/haproxy.service |
|
| 37 |
+sed -i "s/192.168.1.22/127.0.0.0/g" examples/transparent_proxy.cfg |
|
| 36 | 38 |
|
| 37 | 39 |
%install |
| 38 | 40 |
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
|
| 39 |
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/haproxy install
|
|
| 41 |
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/haproxy TARGET=linux2628 install
|
|
| 40 | 42 |
install -vDm755 contrib/systemd/haproxy.service \ |
| 41 | 43 |
%{buildroot}/usr/lib/systemd/system/haproxy.service
|
| 44 |
+install -vDm644 examples/transparent_proxy.cfg %{buildroot}/%{_sysconfdir}/haproxy/haproxy.cfg
|
|
| 42 | 45 |
|
| 43 | 46 |
%files |
| 44 | 47 |
%defattr(-,root,root) |
| 45 |
-%{_sbindir}/haproxy
|
|
| 48 |
+%{_sbindir}/*
|
|
| 46 | 49 |
%{_libdir}/systemd/system/haproxy.service
|
| 50 |
+%{_sysconfdir}/haproxy/haproxy.cfg
|
|
| 47 | 51 |
|
| 48 | 52 |
%files doc |
| 49 | 53 |
%defattr(-,root,root,-) |
| ... | ... |
@@ -51,7 +58,9 @@ install -vDm755 contrib/systemd/haproxy.service \ |
| 51 | 51 |
%{_mandir}/*
|
| 52 | 52 |
|
| 53 | 53 |
%changelog |
| 54 |
-* Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 1.6.3-1 |
|
| 54 |
+* Fri May 20 2016 Xiaolin Li <xiaolinl@vmware.com> 1.6.3-2 |
|
| 55 |
+- Add haproxy-systemd-wrapper to package, add a default configuration file. |
|
| 56 |
+* Mon Feb 22 2016 Xiaolin Li <xiaolinl@vmware.com> 1.6.3-1 |
|
| 55 | 57 |
- Updated to version 1.6.3 |
| 56 | 58 |
* Thu Oct 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.5.14-1 |
| 57 | 59 |
- Add haproxy v1.5 package. |