diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-11-03 11:03:03 +0100 |
---|---|---|
committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
commit | 288d624336d502a7df9856cdc2f6543b6e7c0b79 (patch) | |
tree | 963009cf0594db73bba8c58ae6510f5be74be9c6 /init/tmpfilesd | |
parent | a027bf739848371fa91b5ba9766e031c9003d322 (diff) | |
download | freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.tar.gz freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.tar.xz freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.zip |
Build: integrate init and init/systemd into build system
At the same time, I've renamed tmpfilesd config file to static name
"ipa.conf" instead of using package-specific name. It had no purpose
and just complicated build and packaging.
Variable substitution into configuration has to be done in Makefile
and not in Autoconf as documented in:
Autoconf v2.69 manual chapter 4.8.2 Installation Directory Variables:
... Most of these variables have values that rely on prefix or
exec_prefix. ... Similarly, you should not rely on AC_CONFIG_FILES
to replace bindir and friends in your shell scripts and other files;
instead, let make manage their replacement.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'init/tmpfilesd')
-rw-r--r-- | init/tmpfilesd/Makefile.am | 10 | ||||
-rw-r--r-- | init/tmpfilesd/ipa.conf.in | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/init/tmpfilesd/Makefile.am b/init/tmpfilesd/Makefile.am new file mode 100644 index 000000000..40b9cd5a5 --- /dev/null +++ b/init/tmpfilesd/Makefile.am @@ -0,0 +1,10 @@ +dist_noinst_DATA = \ + ipa.conf.in + +systemdtmpfiles_DATA = \ + ipa.conf + +CLEANFILES = $(systemdtmpfiles_DATA) + +%: %.in Makefile + sed -e 's|@localstatedir[@]|$(localstatedir)|g' '$(srcdir)/$@.in' >$@ diff --git a/init/tmpfilesd/ipa.conf.in b/init/tmpfilesd/ipa.conf.in new file mode 100644 index 000000000..4954000a3 --- /dev/null +++ b/init/tmpfilesd/ipa.conf.in @@ -0,0 +1,5 @@ +d @localstatedir@/run/ipa_memcached 0700 apache apache +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 |