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

Use systemd-sysusers (#2134206)

Browse Source
This commit is contained in:
Ryan O'Hara 2022-10-12 13:48:03 -05:00
parent b9717ad465
commit 51c4b02cd6
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
haproxy.spec
View File

@ -8,7 +8,7 @@
Name: haproxy Name: haproxy
Version: 2.6.6 Version: 2.6.6
Release: 2%{?dist} Release: 3%{?dist}
Summary: HAProxy reverse proxy for high availability environments Summary: HAProxy reverse proxy for high availability environments
License: GPLv2+ License: GPLv2+
@ -19,7 +19,8 @@ Source1: %{name}.service
Source2: %{name}.cfg Source2: %{name}.cfg
Source3: %{name}.logrotate Source3: %{name}.logrotate
Source4: %{name}.sysconfig Source4: %{name}.sysconfig
Source5: halog.1 Source5: %{name}.sysusers
Source6: halog.1
BuildRequires: gcc BuildRequires: gcc
BuildRequires: lua-devel BuildRequires: lua-devel
@ -27,6 +28,7 @@ BuildRequires: pcre2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros
BuildRequires: make BuildRequires: make
Requires(pre): shadow-utils Requires(pre): shadow-utils
@ -66,7 +68,8 @@ popd
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1 %{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
%{__install} -p -D -m 0644 %{SOURCE6} %{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}%{haproxy_confdir}/conf.d
@ -92,12 +95,7 @@ do
done done
%pre %pre
getent group %{haproxy_group} >/dev/null || \ %sysusers_create_compat %{SOURCE5}
groupadd -r %{haproxy_group}
getent passwd %{haproxy_user} >/dev/null || \
useradd -r -g %{haproxy_user} -d %{haproxy_homedir} \
-s /sbin/nologin -c "haproxy" %{haproxy_user}
exit 0
%post %post
%systemd_post %{name}.service %systemd_post %{name}.service
@ -126,8 +124,12 @@ exit 0
%{_bindir}/iprange %{_bindir}/iprange
%{_bindir}/ip6range %{_bindir}/ip6range
%{_mandir}/man1/* %{_mandir}/man1/*
%{_sysusersdir}/%{name}.conf
%changelog %changelog
* Tue Oct 11 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.6-3
- Use systemd-sysusers (#2134206)
* Tue Oct 11 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.6-2 * Tue Oct 11 2022 Ryan O'Hara <rohara@redhat.com> - 2.6.6-2
- Remove USE_REGPARM (#2097885) - Remove USE_REGPARM (#2097885)

1
haproxy.sysusers Normal file
View File

@ -0,0 +1 @@
u haproxy - "haproxy" /var/lib/haproxy