Fix external CA installation

When re-creating the CADS instance it needs to be more fully-populated
so we have enough information to create an SSL certificate and move
the principal to a real entry.

https://fedorahosted.org/freeipa/ticket/1245
This commit is contained in:
Rob Crittenden
2011-06-08 15:56:29 -04:00
committed by Martin Kosek
parent 4ef8b58c26
commit a26fb5aaca
2 changed files with 7 additions and 6 deletions

View File

@@ -766,7 +766,7 @@ def main():
# This can happen if someone passes external_ca_file without
# already having done the first stage of the CA install.
sys.exit('CA is not installed yet. To install with an external CA is a two-stage process.\nFirst run the installer with --external-ca.')
cs = cainstance.CADSInstance(dm_password=dm_password)
cs = cainstance.CADSInstance(host_name, realm_name, domain_name, dm_password)
ca.configure_instance(host_name, dm_password, dm_password,
cert_file=options.external_cert_file,
cert_chain_file=options.external_ca_file,
@@ -811,7 +811,7 @@ def main():
cs.create_certdb()
cs.enable_ssl()
# Add the IPA service for storing the PKI-IPA server certificate.
cs.add_simple_service('dogtagldap/%s@%s' % (host_name, realm_name))
cs.add_simple_service(cs.principal)
cs.add_cert_to_service()
# Create a kerberos instance