diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-06-08 15:56:29 -0400 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-06-09 17:41:43 +0200 |
commit | a26fb5aacafa91bd67061cb85bc9f0c88b735604 (patch) | |
tree | 49dd35fdf2a341d8f882828e50990d94dfc53d9f /install/tools | |
parent | 4ef8b58c26a2b7fde7d4f1ae98053f56ad2823b7 (diff) | |
download | freeipa-a26fb5aacafa91bd67061cb85bc9f0c88b735604.tar.gz freeipa-a26fb5aacafa91bd67061cb85bc9f0c88b735604.tar.xz freeipa-a26fb5aacafa91bd67061cb85bc9f0c88b735604.zip |
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
Diffstat (limited to 'install/tools')
-rwxr-xr-x | install/tools/ipa-server-install | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 23e495e63..a62aa150a 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -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 |