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. --- install/tools/ipa-replica-prepare | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'install/tools/ipa-replica-prepare') diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index c9f1ad087..11649173f 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -51,6 +51,8 @@ def parse_options(): help="Directory Manager (existing master) password") parser.add_option("--ip-address", dest="ip_address", help="Add A and PTR records of the future replica") + parser.add_option("--ca", dest="ca_file", default="/root/cacert.p12", + help="Location of CA PKCS#12 file, default /root/cacert.p12") options, args = parser.parse_args() @@ -274,10 +276,10 @@ def main(): try: if not certs.ipa_self_signed(): # FIXME, need option for location of CA backup - if ipautil.file_exists("/root/tmp-ca.p12"): - shutil.copy("/root/tmp-ca.p12", dir + "/ca.p12") + if ipautil.file_exists(options.ca_file): + shutil.copy(options.ca_file, dir + "/cacert.p12") else: - raise RuntimeError("Root CA PKCS#12 not found in /root/tmp-ca.p12") + raise RuntimeError("Root CA PKCS#12 not found in %s" % options.ca_file) except IOError, e: print "Copy failed %s" % e sys.exit(1) -- cgit