summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-03-10 11:53:24 -0500
committerJason Gerard DeRose <jderose@redhat.com>2010-03-19 04:45:41 -0600
commitf4cb248497d630c4218c3d4ef2112fc4efc2a4e5 (patch)
treedfaef3f06cdbd5deef95857038bfd0e28bcb9e56 /install
parent99cb2fe64a4d6969178544601cb5ba694e65132b (diff)
downloadfreeipa-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 'install')
-rwxr-xr-xinstall/tools/ipa-replica-prepare8
1 files changed, 5 insertions, 3 deletions
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)