diff --git a/haproxy.spec b/haproxy.spec index b9b7f4a..5b5952e 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 2.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HAProxy reverse proxy for high availability environments License: GPLv2+ @@ -19,7 +19,8 @@ Source1: %{name}.service Source2: %{name}.cfg Source3: %{name}.logrotate Source4: %{name}.sysconfig -Source5: halog.1 +Source5: %{name}.sysusers +Source6: halog.1 BuildRequires: gcc BuildRequires: lua-devel @@ -27,6 +28,7 @@ BuildRequires: pcre2-devel BuildRequires: openssl-devel BuildRequires: systemd-devel BuildRequires: systemd +BuildRequires: systemd-rpm-macros BuildRequires: make 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 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{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_datadir} %{__install} -d -m 0755 %{buildroot}%{haproxy_confdir}/conf.d @@ -92,12 +95,7 @@ do done %pre -getent group %{haproxy_group} >/dev/null || \ - 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 +%sysusers_create_compat %{SOURCE5} %post %systemd_post %{name}.service @@ -126,8 +124,12 @@ exit 0 %{_bindir}/iprange %{_bindir}/ip6range %{_mandir}/man1/* +%{_sysusersdir}/%{name}.conf %changelog +* Tue Oct 11 2022 Ryan O'Hara - 2.6.6-3 +- Use systemd-sysusers (#2134206) + * Tue Oct 11 2022 Ryan O'Hara - 2.6.6-2 - Remove USE_REGPARM (#2097885) diff --git a/haproxy.sysusers b/haproxy.sysusers new file mode 100644 index 0000000..f17003a --- /dev/null +++ b/haproxy.sysusers @@ -0,0 +1 @@ +u haproxy - "haproxy" /var/lib/haproxy