diff options
author | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-07-11 11:34:29 -0400 |
---|---|---|
committer | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-07-14 09:06:52 -0400 |
commit | 6980b073035cdd43b30b58aba3ce7f84f16a14ad (patch) | |
tree | 2e291b420d42ad02df9221fb4036bb22698463df /ipa-server/ipa-install/ipa-replica-install | |
parent | b95c05f5c6a9977e6bb02d091a601efb3bcf360e (diff) | |
download | freeipa-6980b073035cdd43b30b58aba3ce7f84f16a14ad.tar.gz freeipa-6980b073035cdd43b30b58aba3ce7f84f16a14ad.tar.xz freeipa-6980b073035cdd43b30b58aba3ce7f84f16a14ad.zip |
Rework the way SSL certificates are imported from PKCS#12 files.
Add the ability to provide PKCS#12 files during initial installation
Add the ability to provide PKCS#12 files when preparing a replica
Correct some issues with ipa-server-certinstall
452402
Diffstat (limited to 'ipa-server/ipa-install/ipa-replica-install')
-rw-r--r-- | ipa-server/ipa-install/ipa-replica-install | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install index a2798bb24..31fd4ccd6 100644 --- a/ipa-server/ipa-install/ipa-replica-install +++ b/ipa-server/ipa-install/ipa-replica-install @@ -103,7 +103,7 @@ def install_ds(config): pkcs12_info = None if ipautil.file_exists(config.dir + "/dscert.p12"): pkcs12_info = (config.dir + "/dscert.p12", - config.dir + "/pwdfile.txt") + config.dir + "/dirsrv_pin.txt") ds = dsinstance.DsInstance() ds.create_instance(config.ds_user, config.realm_name, config.host_name, config.domain_name, config.dirman_password, pkcs12_info) @@ -125,7 +125,7 @@ def install_http(config): pkcs12_info = None if ipautil.file_exists(config.dir + "/httpcert.p12"): pkcs12_info = (config.dir + "/httpcert.p12", - config.dir + "/pwdfile.txt") + config.dir + "/http_pin.txt") http = httpinstance.HTTPInstance() http.create_instance(config.realm_name, config.host_name, config.domain_name, False, pkcs12_info) @@ -174,6 +174,9 @@ def main(): options, filename = parse_options() installutils.standard_logging_setup("/var/log/ipareplica-install.log", options.debug) + if not ipautil.file_exists(filename): + sys.exit("Replica file %s does not exist" % filename) + check_dirsrv() top_dir, dir = expand_info(filename) |