diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2013-05-02 13:47:06 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-05-06 13:37:31 +0200 |
| commit | 80e815191a388f647744e0a1fc7339f1a80be928 (patch) | |
| tree | 0bf8eddf20a8e83a035fa6b0720829eafce839aa | |
| parent | 1b1218f39336dcb32797c267c381997c131929c9 (diff) | |
| download | freeipa.git-80e815191a388f647744e0a1fc7339f1a80be928.tar.gz freeipa.git-80e815191a388f647744e0a1fc7339f1a80be928.tar.xz freeipa.git-80e815191a388f647744e0a1fc7339f1a80be928.zip | |
Specify the location for the agent PKCS#12 file so we don't have to move it.
Dogtag 10.0.2 changed the default location for this file from /root/.pki
to /root/.dogtag which broke our install.
https://fedorahosted.org/freeipa/ticket/3599
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 01e784fd..666df484 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -663,6 +663,7 @@ class CAInstance(service.Service): config.set("CA", "pki_admin_nickname", "ipa-ca-agent") config.set("CA", "pki_admin_subject_dn", str(DN(('cn', 'ipa-ca-agent'), self.subject_base))) + config.set("CA", "pki_client_admin_cert_p12", "/root/ca-agent.p12") # Directory server config.set("CA", "pki_ds_ldap_port", str(self.ds_port)) @@ -749,9 +750,6 @@ class CAInstance(service.Service): print "ipa-server-install --external_cert_file=/path/to/signed_certificate --external_ca_file=/path/to/external_ca_certificate" sys.exit(0) else: - if not self.clone: - shutil.move("/root/.pki/pki-tomcat/ca_admin_cert.p12", \ - "/root/ca-agent.p12") shutil.move("/var/lib/pki/pki-tomcat/alias/ca_backup_keys.p12", \ "/root/cacert.p12") |