diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-11-06 18:59:47 -0800 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-11-08 09:57:21 -0800 |
| commit | 1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8 (patch) | |
| tree | 83a2c5dbaf952e3526a746f0d40db72ea6316dc5 /base/deploy/src/scriptlets/pkiparser.py | |
| parent | cb209df95c4dee11f2a912e20b417fa3bc41c88f (diff) | |
| download | pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.tar.gz pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.tar.xz pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.zip | |
Enable Subordinate CA
* TRAC Ticket #185 - Dogtag 10: Update PKI Deployment to handle subordinate CA
Diffstat (limited to 'base/deploy/src/scriptlets/pkiparser.py')
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index ac77c9f87..cdc3b5f79 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -1455,10 +1455,29 @@ def compose_pki_master_dictionary(): if not len(config.pki_master_dict['pki_security_domain_user']): config.pki_master_dict['pki_security_domain_user'] = "caadmin" if not len(config.pki_master_dict['pki_subsystem_name']): - config.pki_master_dict['pki_subsystem_name'] =\ - config.pki_subsystem + " " +\ - config.pki_master_dict['pki_hostname'] + " " +\ - config.pki_master_dict['pki_https_port'] + if config.str2bool(config.pki_master_dict['pki_clone']): + config.pki_master_dict['pki_subsystem_name'] =\ + config.PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM + " " +\ + config.pki_subsystem + " " +\ + config.pki_master_dict['pki_hostname'] + " " +\ + config.pki_master_dict['pki_https_port'] + elif config.str2bool(config.pki_master_dict['pki_external']): + config.pki_master_dict['pki_subsystem_name'] =\ + config.PKI_DEPLOYMENT_EXTERNAL_CA + " " +\ + config.pki_subsystem + " " +\ + config.pki_master_dict['pki_hostname'] + " " +\ + config.pki_master_dict['pki_https_port'] + elif config.str2bool(config.pki_master_dict['pki_subordinate']): + config.pki_master_dict['pki_subsystem_name'] =\ + config.PKI_DEPLOYMENT_SUBORDINATE_CA + " " +\ + config.pki_subsystem + " " +\ + config.pki_master_dict['pki_hostname'] + " " +\ + config.pki_master_dict['pki_https_port'] + else: + config.pki_master_dict['pki_subsystem_name'] =\ + config.pki_subsystem + " " +\ + config.pki_master_dict['pki_hostname'] + " " +\ + config.pki_master_dict['pki_https_port'] if config.pki_subsystem != "CA" or\ config.str2bool(config.pki_master_dict['pki_clone']) or\ config.str2bool(config.pki_master_dict['pki_subordinate']): |