From ff1e66375c8fd7ac036220b0f6d5cf206fa36a6a Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 18 Aug 2015 12:51:26 +0200 Subject: [PATCH] install: Fix replica install with custom certificates https://fedorahosted.org/freeipa/ticket/5226 Reviewed-By: Martin Babinsky --- ipaserver/install/server/replicainstall.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index ac0f6a32c..664a0baa0 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -573,14 +573,15 @@ def install(installer): otpd.create_instance('OTPD', config.host_name, config.dirman_password, ipautil.realm_to_suffix(config.realm_name)) - CA = cainstance.CAInstance( - config.realm_name, certs.NSS_DIR, - dogtag_constants=dogtag_constants) - CA.dm_password = config.dirman_password + if ipautil.file_exists(config.dir + "/cacert.p12"): + CA = cainstance.CAInstance( + config.realm_name, certs.NSS_DIR, + dogtag_constants=dogtag_constants) + CA.dm_password = config.dirman_password - CA.configure_certmonger_renewal() - CA.import_ra_cert(config.dir + "/ra.p12") - CA.fix_ra_perms() + CA.configure_certmonger_renewal() + CA.import_ra_cert(config.dir + "/ra.p12") + CA.fix_ra_perms() # The DS instance is created before the keytab, add the SSL cert we # generated