diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-03-10 11:53:24 -0500 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2010-03-19 04:45:41 -0600 |
| commit | f4cb248497d630c4218c3d4ef2112fc4efc2a4e5 (patch) | |
| tree | dfaef3f06cdbd5deef95857038bfd0e28bcb9e56 /ipaserver/install/cainstance.py | |
| parent | 99cb2fe64a4d6969178544601cb5ba694e65132b (diff) | |
| download | freeipa-f4cb248497d630c4218c3d4ef2112fc4efc2a4e5.tar.gz freeipa-f4cb248497d630c4218c3d4ef2112fc4efc2a4e5.tar.xz freeipa-f4cb248497d630c4218c3d4ef2112fc4efc2a4e5.zip | |
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.
Diffstat (limited to 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index d2c2c70e5..585bccef1 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() |