From 81d0108afc8f08b0e424d8d1fdf83f1e0ccc7765 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Tue, 23 Apr 2019 09:21:37 +0200
Subject: [PATCH] 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>
---
 .gitignore                                                   | 2 ++
 install/oddjob/Makefile.am                                   | 5 +++++
 .../oddjobd.conf.d/{ipa-server.conf => ipa-server.conf.in}   | 2 +-
 .../{oddjobd-ipa-trust.conf => oddjobd-ipa-trust.conf.in}    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename install/oddjob/etc/oddjobd.conf.d/{ipa-server.conf => ipa-server.conf.in} (87%)
 rename install/oddjob/etc/oddjobd.conf.d/{oddjobd-ipa-trust.conf => oddjobd-ipa-trust.conf.in} (87%)

diff --git a/.gitignore b/.gitignore
index 475a16d7266..775d0217113 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/install/oddjob/Makefile.am b/install/oddjob/Makefile.am
index 101c114e38c..28c3ff07af7 100644
--- a/install/oddjob/Makefile.am
+++ b/install/oddjob/Makefile.am
@@ -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)
 
diff --git a/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf b/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf.in
similarity index 87%
rename from install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
rename to install/oddjob/etc/oddjobd.conf.d/ipa-server.conf.in
index 012e3cbe3db..5b96a18fc7b 100644
--- a/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
+++ b/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf.in
@@ -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"/>
diff --git a/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf b/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf.in
similarity index 87%
rename from install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
rename to install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf.in
index 9f3f168a51a..769839a3599 100644
--- a/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
+++ b/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf.in
@@ -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"/>