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>
This commit is contained in:
Timo Aaltonen
2017-03-22 13:39:18 +01:00
committed by Martin Babinsky
parent 1530758475
commit 44a3e0fe1d
4 changed files with 25 additions and 5 deletions
+19 -1
View File
@@ -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
+2
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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