From 38c66896de1769077cd5b057133606ec5eeaf62b Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 1 Dec 2016 11:37:20 -0500 Subject: Generate tmpfiles config at install time We do not want to generate runtime directories just because the packages are installed, but only if the server is actually setup and run. Also this will be needed later because we will create a user at install time and some tmpfiles will need to be owned by this user. As we are changing this code also rationalize the directory structure and move it from the http rundir to the ipa specific rundir. https://fedorahosted.org/freeipa/ticket/5959 Signed-off-by: Simo Sorce Reviewed-By: Jan Cholasta --- init/tmpfilesd/Makefile.am | 20 -------------------- init/tmpfilesd/ipa.conf.in | 4 ---- 2 files changed, 24 deletions(-) delete mode 100644 init/tmpfilesd/Makefile.am delete mode 100644 init/tmpfilesd/ipa.conf.in (limited to 'init/tmpfilesd') diff --git a/init/tmpfilesd/Makefile.am b/init/tmpfilesd/Makefile.am deleted file mode 100644 index 82afa6ad5..000000000 --- a/init/tmpfilesd/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -dist_noinst_DATA = \ - ipa.conf.in - -systemdtmpfiles_DATA = \ - ipa.conf - -CLEANFILES = $(systemdtmpfiles_DATA) - -%: %.in Makefile - sed -e 's|@localstatedir[@]|$(localstatedir)|g' '$(srcdir)/$@.in' >$@ - -# create empty directories as needed -# DESTDIR might not be set, in that case default to system root -DESTDIR ?= / -install-data-hook: - for conf in $(systemdtmpfiles_DATA); do \ - systemd-tmpfiles --remove --create --boot \ - --root $(DESTDIR) \ - $(DESTDIR)$(systemdtmpfilesdir)/$${conf} || :; \ - done diff --git a/init/tmpfilesd/ipa.conf.in b/init/tmpfilesd/ipa.conf.in deleted file mode 100644 index 5ac96f20f..000000000 --- a/init/tmpfilesd/ipa.conf.in +++ /dev/null @@ -1,4 +0,0 @@ -d @localstatedir@/run/ipa 0700 root root -d @localstatedir@/run/httpd/ipa 0700 apache apache -d @localstatedir@/run/httpd/ipa/clientcaches 0700 apache apache -d @localstatedir@/run/httpd/ipa/krbcache 0700 apache apache -- cgit