Skip to content

Commit

Permalink
systemd, tools: stop creating static cockpit-wsinstance user
Browse files Browse the repository at this point in the history
Co-Authored-By: Martin Pitt <[email protected]>
  • Loading branch information
allisonkarlitskaya and martinpitt committed Nov 21, 2024
1 parent 18d1113 commit 70f0d85
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 17 deletions.
5 changes: 0 additions & 5 deletions src/systemd/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ tmpfilesconfdir = $(prefix)/lib/tmpfiles.d
systemdgenerated += $(nodist_tmpfilesconf_DATA)
nodist_tmpfilesconf_DATA = src/systemd/tmpfiles.d/cockpit-ws.conf

# -----------------
# sysusers
sysusersconfdir = $(prefix)/lib/sysusers.d
dist_sysusersconf_DATA = src/systemd/sysusers.d/cockpit-wsinstance.conf

# -----------------
# Policykit
polkitdir = $(datadir)/polkit-1/actions
Expand Down
1 change: 0 additions & 1 deletion src/systemd/sysusers.d/cockpit-wsinstance.conf

This file was deleted.

6 changes: 0 additions & 6 deletions tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ authentication via sssd/FreeIPA.
%{_unitdir}/cockpit-wsinstance-socket-user.service
%{_unitdir}/system-cockpithttps.slice
%{_prefix}/%{__lib}/tmpfiles.d/cockpit-ws.conf
%{_sysusersdir}/cockpit-wsinstance.conf
%{pamdir}/pam_ssh_add.so
%{pamdir}/pam_cockpit_cert.so
%{_libexecdir}/cockpit-ws
Expand All @@ -409,11 +408,6 @@ authentication via sssd/FreeIPA.
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}

%pre ws
# HACK: old RPM and even Fedora's current RPM don't properly support sysusers
# https://github.com/rpm-software-management/rpm/issues/3073
getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance
getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance

if %{_sbindir}/selinuxenabled 2>/dev/null; then
%selinux_relabel_pre -s %{selinuxtype}
fi
Expand Down
1 change: 0 additions & 1 deletion tools/debian/cockpit-ws.install
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ ${env:deb_systemdsystemunitdir}/system-cockpithttps.slice
${env:deb_pamlibdir}/security/pam_ssh_add.so
${env:deb_pamlibdir}/security/pam_cockpit_cert.so
usr/lib/tmpfiles.d/cockpit-ws.conf
usr/lib/sysusers.d/cockpit-wsinstance.conf
usr/lib/cockpit/cockpit-session
usr/lib/cockpit/cockpit-ws
usr/lib/cockpit/cockpit-wsinstance-factory
Expand Down
4 changes: 0 additions & 4 deletions tools/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,3 @@ else
NO_QUNIT=1 pytest -vv -k 'not linter and not test_descriptions' -opythonpath=$$(ls -d debian/cockpit-bridge/usr/lib/python3*/dist-packages)
endif
endif

# dh compat 14 does that automatically, remove when upgrading
execute_before_dh_installtmpfiles:
dh_installsysusers

0 comments on commit 70f0d85

Please sign in to comment.