diff options
| author | Simo Sorce <simo@redhat.com> | 2016-12-01 11:37:20 -0500 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-02-15 07:13:37 +0100 |
| commit | 38c66896de1769077cd5b057133606ec5eeaf62b (patch) | |
| tree | 579031e3d54e8aec702abd60a39fbaff9f8f3209 /init | |
| parent | c894ebefc5c4c4c7ea340d6ddc4cd3c081917e4a (diff) | |
| download | freeipa-38c66896de1769077cd5b057133606ec5eeaf62b.tar.gz freeipa-38c66896de1769077cd5b057133606ec5eeaf62b.tar.xz freeipa-38c66896de1769077cd5b057133606ec5eeaf62b.zip | |
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 <simo@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Makefile.am | 2 | ||||
| -rw-r--r-- | init/tmpfilesd/Makefile.am | 20 | ||||
| -rw-r--r-- | init/tmpfilesd/ipa.conf.in | 4 |
3 files changed, 1 insertions, 25 deletions
diff --git a/init/Makefile.am b/init/Makefile.am index 8f4d1d0a8..bee424391 100644 --- a/init/Makefile.am +++ b/init/Makefile.am @@ -2,7 +2,7 @@ # AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = systemd tmpfilesd +SUBDIRS = systemd dist_sysconfenv_DATA = \ ipa-dnskeysyncd \ 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 |