Browse code

haproxy: Build with USE_SYSTEMD=1 to fix service startup

haproxy service startup fails with:

"haproxy[863]: [ALERT] 297/183339 (863) : master-worker mode with
systemd support (-Ws) requested, but not compiled. Use master-worker
mode (-W) if you are not using Type=notify in your unit file or
recompile with USE_SYSTEMD=1."

We do use Type=notify within haproxy.service, so re-build the package
with USE_SYSTEMD=1.

Change-Id: I90b5ec77074d9195f94b6b0dc5ec8b1c0e668c88
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5987
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Srivatsa S. Bhat (VMware) authored on 2018/10/26 03:57:15
Showing 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.8.13
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        GPL
6 6
 URL:            http://www.haproxy.org
7 7
 Group:          Applications/System
... ...
@@ -14,7 +14,7 @@ BuildRequires:  pcre-devel
14 14
 BuildRequires:  lua-devel
15 15
 BuildRequires:  pkg-config
16 16
 BuildRequires:  zlib-devel
17
-BuildRequires:  systemd
17
+BuildRequires:  systemd-devel
18 18
 Requires:       systemd
19 19
 
20 20
 %description
... ...
@@ -33,7 +33,7 @@ Requires:       %{name} = %{version}-%{release}
33 33
 
34 34
 %build
35 35
 make %{?_smp_mflags} TARGET=linux2628 USE_PCRE=1 USE_OPENSSL=1 \
36
-        USE_GETADDRINFO=1 USE_ZLIB=1
36
+        USE_GETADDRINFO=1 USE_ZLIB=1 USE_SYSTEMD=1
37 37
 make %{?_smp_mflags} -C contrib/systemd
38 38
 sed -i s/"local\/"/""/g contrib/systemd/haproxy.service
39 39
 sed -i "s/\/run/\/var\/run/g" contrib/systemd/haproxy.service
... ...
@@ -58,6 +58,8 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr
58 58
 %{_mandir}/*
59 59
 
60 60
 %changelog
61
+*   Thu Oct 25 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 1.8.13-2
62
+-   Build with USE_SYSTEMD=1 to fix service startup.
61 63
 *   Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.8.13-1
62 64
 -   Update to version 1.8.13
63 65
 *   Tue Apr 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.6.12-1
... ...
@@ -72,4 +74,3 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr
72 72
 -   Updated to version 1.6.3
73 73
 *   Thu Oct 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.5.14-1
74 74
 -   Add haproxy v1.5 package.
75
-