[Freeipa-devel] [PATCHES 523-525] replica install: add remote connection check over API

[Alexander Bokovoy]

On Wed, 09 Dec 2015, Jan Cholasta wrote:
>From 142fd5364cf9d31d7e2c35959516ac8d9054c9da Mon Sep 17 00:00:00 2001
>From: Jan Cholasta <jcholast at redhat.com>
>Date: Wed, 9 Dec 2015 08:17:07 +0100
>Subject: [PATCH 1/3] build: put oddjob scripts into separate directory
>
>https://fedorahosted.org/freeipa/ticket/5497
>---
> freeipa.spec.in                                          | 3 ++-
> install/oddjob/Makefile.am                               | 2 +-
> install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf | 2 +-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/freeipa.spec.in b/freeipa.spec.in
>index a60d9b6..95948e7 100644
>--- a/freeipa.spec.in
>+++ b/freeipa.spec.in
>@@ -740,6 +740,7 @@ fi
> %{_libexecdir}/ipa/ipa-dnskeysync-replica
> %{_libexecdir}/ipa/ipa-ods-exporter
> %{_libexecdir}/ipa/ipa-httpd-kdcproxy
>+%dir %{_libexecdir}/ipa/oddjob
> %ghost %verify(not owner group) %dir %{_sharedstatedir}/kdcproxy
> %dir %attr(0755,root,root) %{_sysconfdir}/ipa/kdcproxy
> %config(noreplace) %{_sysconfdir}/sysconfig/ipa_memcached
>@@ -914,7 +915,7 @@ fi
> %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
> %{_sysconfdir}/dbus-1/system.d/oddjob-ipa-trust.conf
> %{_sysconfdir}/oddjobd.conf.d/oddjobd-ipa-trust.conf
>-%%attr(755,root,root) %{_libexecdir}/ipa/com.redhat.idm.trust-fetch-domains
>+%attr(755,root,root) %{_libexecdir}/ipa/oddjob/com.redhat.idm.trust-fetch-domains
As you modified oddjobd config file, you need to restart oddjobd on
upgrade to let it re-read the config.

> 
> %endif # ONLY_CLIENT
> 
>diff --git a/install/oddjob/Makefile.am b/install/oddjob/Makefile.am
>index 9dde10c..5cdaf2b 100644
>--- a/install/oddjob/Makefile.am
>+++ b/install/oddjob/Makefile.am
>@@ -1,6 +1,6 @@
> NULL =
> 
>-oddjobdir = $(libexecdir)/ipa
>+oddjobdir = $(libexecdir)/ipa/oddjob
> oddjobconfdir = $(sysconfdir)/oddjobd.conf.d
> dbusconfdir = $(sysconfdir)/dbus-1/system.d
> 
>diff --git a/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf b/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
>index 17817de..bc2e8d1 100644
>--- a/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
>+++ b/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
>@@ -10,7 +10,7 @@
>       </interface>
>       <interface name="com.redhat.idm.trust">
>         <method name="fetch_domains">
>-          <helper exec="/usr/libexec/ipa/com.redhat.idm.trust-fetch-domains"
>+          <helper exec="/usr/libexec/ipa/oddjob/com.redhat.idm.trust-fetch-domains"
> 		  arguments="1"
>                   argument_passing_method="cmdline"
> 		  prepend_user_name="no"/>
>-- 
>2.4.3
>


-- 
/ Alexander Bokovoy