diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2013-10-15 17:55:05 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2013-10-15 17:59:23 -0700 |
| commit | 47c77a67d67cb443070137fd9b8d64955d499089 (patch) | |
| tree | 12b7588f34a80a74c000e77b19017ec941ad5231 /base/server/sbin | |
| parent | 618be8bd7e9488a325789232c94aad109f9b6803 (diff) | |
| download | pki-47c77a67d67cb443070137fd9b8d64955d499089.tar.gz pki-47c77a67d67cb443070137fd9b8d64955d499089.tar.xz pki-47c77a67d67cb443070137fd9b8d64955d499089.zip | |
Stand-alone DRM
* TRAC Ticket #667 - provide option for ca-less drm install
Diffstat (limited to 'base/server/sbin')
| -rwxr-xr-x | base/server/sbin/pkispawn | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index d0ac96716..d048147e3 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -416,9 +416,14 @@ def main(argv): print 'ERROR: Unable to access directory server: ' + e.message['desc'] sys.exit(1) - if config.pki_subsystem != "CA" or\ - config.str2bool(parser.pki_master_dict['pki_clone']) or\ - config.str2bool(parser.pki_master_dict['pki_subordinate']): + if ((config.pki_subsystem == "KRA" or + config.pki_subsystem == "OCSP") and + not config.str2bool(parser.pki_master_dict['pki_standalone'])) or\ + config.pki_subsystem == "TKS" or\ + config.pki_subsystem == "TPS" or\ + config.str2bool(parser.pki_master_dict['pki_clone']) or\ + (config.pki_subsystem == "CA" and + config.str2bool(parser.pki_master_dict['pki_subordinate'])): try: # Verify existence of Security Domain Password if not parser.pki_master_dict.has_key('pki_security_domain_password') or\ @@ -486,17 +491,25 @@ def print_install_information(pki_master_dict): else: print " Administrator's username: %s" % pki_master_dict['pki_admin_uid'] if os.path.isfile(pki_master_dict['pki_client_admin_cert_p12']): - print " Administrator's PKCS #12 file:\n %s" % (pki_master_dict['pki_client_dir'] + '/ca_admin_cert.p12') + print " Administrator's PKCS #12 file:\n %s" % pki_master_dict['pki_client_admin_cert_p12'] if not config.str2bool(pki_master_dict['pki_client_database_purge']): print - print " Administrator's certificate nickname: %s" % pki_master_dict['pki_admin_nickname'] + print " Administrator's certificate nickname:\n %s" % pki_master_dict['pki_admin_nickname'] print " Administrator's certificate database:\n %s" % pki_master_dict['pki_client_database_dir'] print print log.PKI_CHECK_STATUS_MESSAGE % pki_master_dict['pki_instance_name'] print log.PKI_INSTANCE_RESTART_MESSAGE % pki_master_dict['pki_instance_name'] - print log.PKI_ACCESS_URL % (pki_master_dict['pki_hostname'], - pki_master_dict['pki_https_port'], - config.pki_subsystem.lower()) + if (((config.pki_subsystem == "KRA" or + config.pki_subsystem == "OCSP") and + config.str2bool(pki_master_dict['pki_standalone'])) and + not config.str2bool(pki_master_dict['pki_external_step_two'])): + # Stand-alone PKI KRA/OCSP (External CA Step 1) + print + print log.PKI_CONFIGURATION_STANDALONE_1 % config.pki_subsystem + else: + print log.PKI_ACCESS_URL % (pki_master_dict['pki_hostname'], + pki_master_dict['pki_https_port'], + config.pki_subsystem.lower()) print log.PKI_SPAWN_INFORMATION_FOOTER def log_error_details(): |