From d703f3dbcb992b0f29c5c71c35ec112eadccf2ed Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 23 Apr 2019 09:19:33 +0200 Subject: [PATCH] Debian: Fix replicatio of light weight sub CAs The path to ipa-pki-retrieve-key was hard-coded, which broke replication of light weight sub CA keys. Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy Reviewed-By: Rob Crittenden --- ipaplatform/base/paths.py | 1 + ipaplatform/debian/paths.py | 1 + ipaserver/install/cainstance.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 8b21733b9..fb7ff4fde 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -216,6 +216,7 @@ class BasePathNamespace: IPA_DNSKEYSYNCD = "/usr/libexec/ipa/ipa-dnskeysyncd" IPA_HTTPD_KDCPROXY = "/usr/libexec/ipa/ipa-httpd-kdcproxy" IPA_ODS_EXPORTER = "/usr/libexec/ipa/ipa-ods-exporter" + IPA_PKI_RETRIEVE_KEY = "/usr/libexec/ipa/ipa-pki-retrieve-key" IPA_HTTPD_PASSWD_READER = "/usr/libexec/ipa/ipa-httpd-pwdreader" IPA_PKI_WAIT_RUNNING = "/usr/libexec/ipa/ipa-pki-wait-running" DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel-pkcs11" diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index d698e2a30..f10df39bb 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -84,6 +84,7 @@ class DebianPathNamespace(BasePathNamespace): IPA_DNSKEYSYNCD = "/usr/lib/ipa/ipa-dnskeysyncd" IPA_HTTPD_KDCPROXY = "/usr/lib/ipa/ipa-httpd-kdcproxy" IPA_ODS_EXPORTER = "/usr/lib/ipa/ipa-ods-exporter" + IPA_PKI_RETRIEVE_KEY = "/usr/lib/ipa/ipa-pki-retrieve-key" IPA_HTTPD_PASSWD_READER = "/usr/lib/ipa/ipa-httpd-pwdreader" IPA_PKI_WAIT_RUNNING = "/usr/lib/ipa/ipa-pki-wait-running" HTTPD = "/usr/sbin/apache2ctl" diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 6b8f7dd8a..ade5353f0 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1260,7 +1260,7 @@ class CAInstance(DogtagInstance): ('features.authority.keyRetrieverClass', 'com.netscape.ca.ExternalProcessKeyRetriever'), ('features.authority.keyRetrieverConfig.executable', - '/usr/libexec/ipa/ipa-pki-retrieve-key'), + paths.IPA_PKI_RETRIEVE_KEY), ] for k, v in directives: directivesetter.set_directive(