Rename cockpit-tempfiles.conf to cockpit-ws.conf

Follow the name of the functionality in systemd: See: https://www.freedesktop.org/software/systemd/man/latest/tmpfiles.d.html In particular, this should be named after the package name (cockpit-ws), and putting "tempfiles" into a tmpfiles.d/ file name is redundant. Co-Authored-By: Martin Pitt <[email protected]>
cowboyox · Apr 30, 2024 · 0642db0 · 0642db0
1 parent 1bc79c0
commit 0642db0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/systemd/Makefile.am b/src/systemd/Makefile.am
@@ -30,8 +30,8 @@ install-exec-hook::
 	mkdir -p $(DESTDIR)$(sysconfdir)/issue.d
 	ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/issue.d/cockpit.issue
 
-tempconfdir = $(prefix)/lib/tmpfiles.d
-nodist_tempconf_DATA = src/systemd/cockpit-tempfiles.conf
+tmpfilesconfdir = $(prefix)/lib/tmpfiles.d
+nodist_tmpfilesconf_DATA = src/systemd/tmpfiles.d/cockpit-ws.conf
 
 # we can't generate these with config.status because,
 # eg. it does "@libexecdir@" -> "${exec_prefix}/libexec"
@@ -49,7 +49,7 @@ src/systemd/%: src/systemd/%.in
 
 systemdgenerated = \
 	$(nodist_systemdunit_DATA) \
-	$(nodist_tempconf_DATA) \
+	$(nodist_tmpfilesconf_DATA) \
 	$(NULL)
 systemdgenerated_in = $(patsubst %,%.in,$(systemdgenerated))
 

diff --git a/src/systemd/cockpit-tempfiles.conf.in → src/systemd/tmpfiles.d/cockpit-ws.conf.in b/src/systemd/cockpit-tempfiles.conf.in → src/systemd/tmpfiles.d/cockpit-ws.conf.in
diff --git a/tools/arch/PKGBUILD b/tools/arch/PKGBUILD
@@ -66,7 +66,7 @@ package_cockpit() {
   install -Dm644 "$srcdir"/cockpit-ws.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-ws.conf
   install -Dm644 "$srcdir"/cockpit-wsinstance.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-wsinstance.conf
 
-  echo "z /usr/lib/cockpit/cockpit-session - - cockpit-wsinstance -" >> "$pkgdir"/usr/lib/tmpfiles.d/cockpit-tempfiles.conf
+  echo "z /usr/lib/cockpit/cockpit-session - - cockpit-wsinstance -" >> "$pkgdir"/usr/lib/tmpfiles.d/cockpit-ws.conf
 
   # remove unused plugins
   rm -rf "$pkgdir"/usr/share/cockpit/{selinux,playground,sosreport} \

diff --git a/tools/cockpit.spec b/tools/cockpit.spec
@@ -402,7 +402,7 @@ authentication via sssd/FreeIPA.
 %{_unitdir}/[email protected]
 %{_unitdir}/[email protected]
 %{_unitdir}/system-cockpithttps.slice
-%{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
+%{_prefix}/%{__lib}/tmpfiles.d/cockpit-ws.conf
 %{pamdir}/pam_ssh_add.so
 %{pamdir}/pam_cockpit_cert.so
 %{_libexecdir}/cockpit-ws
@@ -447,7 +447,7 @@ if [ "$1" = 1 ]; then
     chmod 644 /etc/cockpit/disallowed-users
 fi
 
-%tmpfiles_create cockpit-tempfiles.conf
+%tmpfiles_create cockpit-ws.conf
 %systemd_post cockpit.socket cockpit.service
 # firewalld only partially picks up changes to its services files without this
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true

diff --git a/tools/debian/cockpit-ws.install b/tools/debian/cockpit-ws.install
@@ -13,7 +13,7 @@ ${env:deb_systemdsystemunitdir}/[email protected]
 ${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-tempfiles.conf
+usr/lib/tmpfiles.d/cockpit-ws.conf
 usr/lib/cockpit/cockpit-session
 usr/lib/cockpit/cockpit-ws
 usr/lib/cockpit/cockpit-wsinstance-factory