diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-08-18 12:51:26 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-08-18 16:24:19 +0200 |
| commit | bfe937715236e71037f05885293afb3d1c8d2227 (patch) | |
| tree | c14e5d8eab9611f39df904a0165d33d3b26ac1f5 | |
| parent | e4b8cffdb4e017874bb7f12a7ca362b927ead67a (diff) | |
| download | freeipa-bfe937715236e71037f05885293afb3d1c8d2227.tar.gz freeipa-bfe937715236e71037f05885293afb3d1c8d2227.tar.xz freeipa-bfe937715236e71037f05885293afb3d1c8d2227.zip | |
install: Fix replica install with custom certificates
https://fedorahosted.org/freeipa/ticket/5226
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
| -rw-r--r-- | ipaserver/install/server/replicainstall.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index dd8bc0d4b..0725c7763 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 - - CA.configure_certmonger_renewal() - CA.import_ra_cert(config.dir + "/ra.p12") - CA.fix_ra_perms() + 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() # The DS instance is created before the keytab, add the SSL cert we # generated |