From f4cb248497d630c4218c3d4ef2112fc4efc2a4e5 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 10 Mar 2010 11:53:24 -0500 Subject: Make CA PKCS#12 location arg for ipa-replica-prepare, default /root/cacert.p12 pki-silent puts a copy of the root CA into /root/tmp-ca.p12. Rename this to /root/cacert.p12. --- ipaserver/install/cainstance.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipaserver/install/cainstance.py') diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index d2c2c70e..585bccef 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -644,6 +644,11 @@ class CAInstance(service.Service): print "failed to restart ca instance", e logging.debug("failed to restart ca instance %s" % e) + # pkisilent makes a copy of the CA PKCS#12 file for us but gives + # it a lousy name. + if ipautil.file_exists("/root/tmp-ca.p12"): + shutil.move("/root/tmp-ca.p12", "/root/cacert.p12") + def __restart_instance(self): try: self.restart() -- cgit