Debian: auto-generate config files for oddjobd

The oddjobd config files are now auto-generated with automake to have
correct path to libexec on all platforms.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes 2019-04-23 09:21:37 +02:00
parent d703f3dbcb
commit 81d0108afc
4 changed files with 9 additions and 2 deletions

2
.gitignore vendored
View File

@ -133,6 +133,8 @@ daemons/dnssec/ipa-ods-exporter
install/certmonger/dogtag-ipa-ca-renew-agent-submit
install/certmonger/ipa-server-guard
install/oddjob/com.redhat.idm.trust-fetch-domains
install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
install/restart_scripts/renew_ca_cert
install/restart_scripts/renew_kdc_cert
install/restart_scripts/renew_ra_cert

View File

@ -6,6 +6,8 @@ dbusconfdir = $(sysconfdir)/dbus-1/system.d
dist_noinst_DATA = \
com.redhat.idm.trust-fetch-domains.in \
etc/oddjobd.conf.d/oddjobd-ipa-trust.conf.in \
etc/oddjobd.conf.d/ipa-server.conf.in \
$(NULL)
dist_oddjob_SCRIPTS = \
@ -27,6 +29,9 @@ dist_oddjobconf_DATA = \
etc/oddjobd.conf.d/ipa-server.conf \
$(NULL)
$(dist_oddjobconf_DATA):%: %.in Makefile
$(AM_V_GEN)sed -e 's|@ODDJOBDIR[@]|$(oddjobdir)|g' $< > $@
PYTHON_SHEBANG = $(nodist_oddjob_SCRIPTS)
CLEANFILES = $(PYTHON_SHEBANG)

View File

@ -6,7 +6,7 @@
<object name="/">
<interface name="org.freeipa.server">
<method name="conncheck">
<helper exec="/usr/libexec/ipa/oddjob/org.freeipa.server.conncheck"
<helper exec="@ODDJOBDIR@/org.freeipa.server.conncheck"
arguments="1"
prepend_user_name="no"
argument_passing_method="cmdline"/>

View File

@ -10,7 +10,7 @@
</interface>
<interface name="com.redhat.idm.trust">
<method name="fetch_domains">
<helper exec="/usr/libexec/ipa/oddjob/com.redhat.idm.trust-fetch-domains"
<helper exec="@ODDJOBDIR@/com.redhat.idm.trust-fetch-domains"
arguments="30"
argument_passing_method="cmdline"
prepend_user_name="no"/>