diff options
| author | Timo Aaltonen <tjaalton@debian.org> | 2017-03-15 16:41:50 +0200 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2017-03-22 13:39:18 +0100 |
| commit | 44a3e0fe1d168ad87182654976a26e352287b1e0 (patch) | |
| tree | 63e14a9301db30cb7348a663e7d6d4605e1f1fce | |
| parent | 1530758475c2e21dd732581ff6816e03ca74dede (diff) | |
| download | freeipa-44a3e0fe1d168ad87182654976a26e352287b1e0.tar.gz freeipa-44a3e0fe1d168ad87182654976a26e352287b1e0.tar.xz freeipa-44a3e0fe1d168ad87182654976a26e352287b1e0.zip | |
configure: Use ODS_USER and NAMED_GROUP in daemons/dnssec/*.service.in
These are platform specific, add values for Debian and default values
for Fedora/RHEL.
Also, use prettier output when checking the extra python install options.
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | daemons/dnssec/Makefile.am | 2 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-dnskeysyncd.service.in | 6 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-ods-exporter.service.in | 2 |
4 files changed, 25 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2d84426d1..7a67ec0ef 100644 --- a/configure.ac +++ b/configure.ac @@ -304,13 +304,31 @@ AC_SUBST([IPAPLATFORM]) AC_MSG_RESULT([${IPAPLATFORM}]) if test "x${IPAPLATFORM}" == "xdebian"; then + NAMED_GROUP="bind" + ODS_USER="opendnssec" # see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb" else + NAMED_GROUP="named" + ODS_USER="ods" PYTHON_INSTALL_EXTRA_OPTIONS="" fi + +AC_MSG_CHECKING([NAMED_GROUP]) +AC_SUBST([NAMED_GROUP]) +AC_MSG_RESULT([${NAMED_GROUP}]) + +AC_MSG_CHECKING([ODS_USER]) +AC_SUBST([ODS_USER]) +AC_MSG_RESULT([${ODS_USER}]) + +AC_MSG_CHECKING([python setup.py install extra options]) AC_SUBST([PYTHON_INSTALL_EXTRA_OPTIONS]) -AC_MSG_RESULT([python setup.py install extra options ${PYTHON_INSTALL_EXTRA_OPTIONS}]) +if test "x${PYTHON_INSTALL_EXTRA_OPTIONS}" == "x"; then + AC_MSG_RESULT([none]) +else + AC_MSG_RESULT([${PYTHON_INSTALL_EXTRA_OPTIONS}]) +fi dnl --------------------------------------------------------------------------- dnl Version information from VERSION.m4 and command line diff --git a/daemons/dnssec/Makefile.am b/daemons/dnssec/Makefile.am index 37a0dcf51..b0db4e1bf 100644 --- a/daemons/dnssec/Makefile.am +++ b/daemons/dnssec/Makefile.am @@ -25,6 +25,8 @@ CLEANFILES = $(systemdsystemunit_DATA) -e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@sysconfenvdir[@]|$(sysconfenvdir)|g' \ + -e 's|@ODS_USER[@]|$(ODS_USER)|g' \ + -e 's|@NAMED_GROUP[@]|$(NAMED_GROUP)|g' \ '$(srcdir)/$@.in' >$@ dnssecconfdir = $(IPA_SYSCONF_DIR)/dnssec diff --git a/daemons/dnssec/ipa-dnskeysyncd.service.in b/daemons/dnssec/ipa-dnskeysyncd.service.in index f39c3ceb4..38c6f9296 100644 --- a/daemons/dnssec/ipa-dnskeysyncd.service.in +++ b/daemons/dnssec/ipa-dnskeysyncd.service.in @@ -4,9 +4,9 @@ Description=IPA key daemon [Service] EnvironmentFile=@sysconfenvdir@/ipa-dnskeysyncd ExecStart=@libexecdir@/ipa/ipa-dnskeysyncd -User=ods -Group=named -SupplementaryGroups=ods +User=@ODS_USER@ +Group=@NAMED_GROUP@ +SupplementaryGroups=@ODS_USER@ PrivateTmp=yes Restart=on-failure RestartSec=60s diff --git a/daemons/dnssec/ipa-ods-exporter.service.in b/daemons/dnssec/ipa-ods-exporter.service.in index 5ec7317b8..ef742877d 100644 --- a/daemons/dnssec/ipa-ods-exporter.service.in +++ b/daemons/dnssec/ipa-ods-exporter.service.in @@ -6,7 +6,7 @@ After=ipa-ods-exporter.socket [Service] EnvironmentFile=@sysconfenvdir@/ipa-ods-exporter ExecStart=@libexecdir@/ipa/ipa-ods-exporter -User=ods +User=@ODS_USER@ PrivateTmp=yes Restart=on-failure RestartSec=60s |