Skip to content

Use the RPM built-in sysusers feature #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xsuchy merged 1 commit into from
Jun 11, 2025
Merged

Use the RPM built-in sysusers feature #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in v???:

* Enhancements

- Resalloc packages use the RPM built-in mechanism for handling
system users (modern distributions only).

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in v5.9:

* Enhancements
Expand Down
37 changes: 35 additions & 2 deletions rpm/resalloc.spec.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ the purposes of CI/CD tasks.
%bcond_with python3
%endif

# Modern distributions (using RPM v4.19+; for example, Fedora 39+) do not
# require the %%pre scriptlet for creating users/groups because the sysusers
# feature is now built directly into RPM. Simply including the sysusers
# `mock.conf` file in a package payload is sufficient to leverage this feature.
# However, for older distributions that lack this capability, we still define
# the %%pre scriptlet.
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?mageia} && 0%{?mageia} < 10) || (0%{?suse_version} && 0%{?suse_version} < 1660)
Copy link
Collaborator

@FrostyX FrostyX Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too bad there is no macro with RPM version because this is getting out of hand.

Copy link
Owner Author

@praiskup praiskup Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I just c&p'ed this from a place where people cared (mock), but I think we are just fine to support RHEL8+ and Fedora (if you think this is too ugly).

I think the problem is how to compare %rpmversion, without lua/bash heavy lifting...

Copy link
Owner Author

@praiskup praiskup Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is cool thing, btw.

$ rpm --eval '%[v"4.20.0" > v"4.19.0"]'
1

But this is RHEL9+ only: rpm-software-management/rpm@145b5f8

Copy link

@hroncok hroncok Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?mageia} && 0%{?mageia} < 10) || (0%{?suse_version} && 0%{?suse_version} < 1660)
%if %{?rpmversion:v"%{rpmversion}" >= v"4.19"}%{!?rpmversion:0}

If the RPM version is too old for the comparison and this feature, it does not have the macro defined.

Copy link

@hroncok hroncok Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, my condition is reversed. But you get the idea.

Copy link
Collaborator

@xsuchy xsuchy Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I already merged the PR. But good suggestion. Thank you.

%bcond_without sysusers_compat
%else
%bcond_with sysusers_compat
%endif

%global default_python %{?with_python3:python3}%{!?with_python3:python2}
%global default_sitelib %{?with_python3:%python3_sitelib}%{!?with_python3:%python_sitelib}

Expand Down Expand Up @@ -82,6 +94,10 @@ BuildRequires: python-yaml

Requires: %default_python-%srcname = %version-%release

%if %{with sysusers_compat}
Requires(pre): shadow-utils
%endif

Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-@TARBALL_VERSION@.tar.gz
Source1: resalloc.service
Source5: resalloc-agent-spawner.service
Expand Down Expand Up @@ -116,7 +132,6 @@ Requires: python-sqlalchemy
Requires: python-yaml
%endif

Requires(pre): /usr/sbin/useradd
%description server
%desc

Expand Down Expand Up @@ -156,7 +171,6 @@ it shows page with information about resalloc resources.
%package agent-spawner
Summary: %sum - daemon starting agent-like resources

Requires(pre): /usr/sbin/useradd
Requires: python3-copr-common >= 0.23
Requires: python3-daemon
Requires: python3-redis
Expand Down Expand Up @@ -219,6 +233,16 @@ restorecon -R %_var/www/cgi-%{name} || :
rm -r resalloc_agent_spawner
%endif

# Create sysusers.d config files
cat >resalloc.sysusers.conf <<EOF
u resalloc - '%sysuser service user' %_homedir /bin/bash
m resalloc %sysgroup
EOF
cat >resalloc-agent-spawner.sysusers.conf <<EOF
u resalloc-agent-spawner - '%agent_user service user' - -
m resalloc-agent-spawner %agent_group
EOF


%build
%if %{with python2}
Expand Down Expand Up @@ -266,6 +290,9 @@ rm %buildroot%_bindir/%name-agent-*
rm %buildroot%_sysconfdir/resalloc-agent-spawner/config.yaml
%endif

install -m0644 -D resalloc.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc.conf
install -m0644 -D resalloc-agent-spawner.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc-agent-spawner.conf


%if %{with check}
%check
Expand All @@ -281,8 +308,10 @@ make check TEST_PYTHONS="python3"
ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project


%if %{with sysusers_compat}
%pre server
%create_user_group %sysuser %sysgroup /bin/bash %_homedir
%endif

%post server
%systemd_post resalloc.service
Expand All @@ -292,8 +321,10 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project


%if %{with python3}
%if %{with sysusers_compat}
%pre agent-spawner
%create_user_group %agent_user %agent_group /bin/false /
%endif

%post agent-spawner
%systemd_post resalloc-agent-spawner.service
Expand Down Expand Up @@ -346,6 +377,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%config %_sysconfdir/logrotate.d/resalloc-server
%_libexecdir/resalloc-merge-hook-logs
%config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc
%{_sysusersdir}/resalloc.conf


%files helpers
Expand All @@ -361,6 +393,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%{default_sitelib}/%{name}_agent_spawner
%_unitdir/resalloc-agent-spawner.service
%config(noreplace) %_sysconfdir/resalloc-agent-spawner
%{_sysusersdir}/resalloc-agent-spawner.conf

%files webui
%doc %doc_files
Expand Down