ipa-otpd.socket.in: Use a platform specific value for KDC service file

https://pagure.io/freeipa/issue/6845

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
This commit is contained in:
Timo Aaltonen
2017-04-12 16:17:51 +02:00
committed by Tomas Krizek
parent db84516d23
commit 076eb409a0
3 changed files with 6 additions and 1 deletions
+4
View File
@@ -330,16 +330,20 @@ AC_SUBST([IPAPLATFORM])
AC_MSG_RESULT([${IPAPLATFORM}]) AC_MSG_RESULT([${IPAPLATFORM}])
if test "x${IPAPLATFORM}" == "xdebian"; then if test "x${IPAPLATFORM}" == "xdebian"; then
KRB5KDC_SERVICE="krb5-kdc.service"
NAMED_GROUP="bind" NAMED_GROUP="bind"
ODS_USER="opendnssec" ODS_USER="opendnssec"
# see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html # see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html
PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb" PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb"
else else
KRB5KDC_SERVICE="krb5kdc.service"
NAMED_GROUP="named" NAMED_GROUP="named"
ODS_USER="ods" ODS_USER="ods"
PYTHON_INSTALL_EXTRA_OPTIONS="" PYTHON_INSTALL_EXTRA_OPTIONS=""
fi fi
AC_SUBST([KRB5KDC_SERVICE])
AC_MSG_CHECKING([NAMED_GROUP]) AC_MSG_CHECKING([NAMED_GROUP])
AC_SUBST([NAMED_GROUP]) AC_SUBST([NAMED_GROUP])
AC_MSG_RESULT([${NAMED_GROUP}]) AC_MSG_RESULT([${NAMED_GROUP}])
+1
View File
@@ -11,6 +11,7 @@ ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c
%.socket: %.socket.in %.socket: %.socket.in
@sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \ @sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \
-e 's|@KRB5KDC_SERVICE[@]|$(KRB5KDC_SERVICE)|g' \
-e 's|@UNLINK[@]|@UNLINK@|g' \ -e 's|@UNLINK[@]|@UNLINK@|g' \
$< > $@ $< > $@
+1 -1
View File
@@ -8,4 +8,4 @@ SocketMode=0600
Accept=true Accept=true
[Install] [Install]
WantedBy=krb5kdc.service WantedBy=@KRB5KDC_SERVICE@