diff options
Diffstat (limited to 'base/deploy/src/scriptlets')
| -rw-r--r-- | base/deploy/src/scriptlets/pkimessages.py | 7 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 16 |
2 files changed, 8 insertions, 15 deletions
diff --git a/base/deploy/src/scriptlets/pkimessages.py b/base/deploy/src/scriptlets/pkimessages.py index dbfb8e1f7..8d7ba1b6e 100644 --- a/base/deploy/src/scriptlets/pkimessages.py +++ b/base/deploy/src/scriptlets/pkimessages.py @@ -20,9 +20,9 @@ # # PKI Deployment Engine Messages -PKI_DICTIONARY_COMMON ="\n"\ +PKI_DICTIONARY_DEFAULT ="\n"\ "=====================================================\n"\ -" DISPLAY CONTENTS OF PKI COMMON DICTIONARY\n"\ +" DISPLAY CONTENTS OF PKI DEFAULT DICTIONARY\n"\ "=====================================================" PKI_DICTIONARY_MASTER="\n"\ "=====================================================\n"\ @@ -137,9 +137,6 @@ PKISPAWN_EPILOG =\ " Apache: 'pki_instance_name', 'pki_http_port', and 'pki_https_port'\n"\ " Tomcat: 'pki_instance_name', 'pki_http_port', 'pki_https_port',\n"\ " 'pki_ajp_port', and 'pki_tomcat_server_port'\n\n"\ -" Optionally, the 'pki_admin_domain_name' may be changed instead of, or\n"\ -" in addition to, the 'pki_instance_name' since a PKI instance is\n"\ -" defined as '${pki_instance_name}[.${pki_admin_domain_name}]'.\n\n"\ " Finally, if an optional '-p <prefix>' is defined, this value WILL NOT\n"\ " be prepended in front of the mandatory '-f <configuration_file>'.\n\n" +\ PKI_VERBOSITY diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 05536f424..6109e7486 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -227,12 +227,12 @@ class PKIConfigParser: default_http_port = '80' default_https_port = '443' - predefined_dict = {'default_instance_name': default_instance_name, - 'default_http_port': default_http_port, - 'default_https_port': default_https_port, - 'dns_domainname': config.pki_dns_domainname, - 'subsystem_type' : config.pki_subsystem, - 'hostname': config.pki_hostname} + predefined_dict = {'pki_instance_name': default_instance_name, + 'pki_http_port': default_http_port, + 'pki_https_port': default_https_port, + 'pki_dns_domainname': config.pki_dns_domainname, + 'pki_subsystem' : config.pki_subsystem, + 'pki_hostname': config.pki_hostname} self.pki_config = ConfigParser.SafeConfigParser(predefined_dict) # Make keys case-sensitive! @@ -283,9 +283,6 @@ class PKIConfigParser: config.pki_master_dict['pki_certificate_timestamp'] =\ config.pki_certificate_timestamp config.pki_master_dict['pki_architecture'] = config.pki_architecture - config.pki_master_dict['pki_hostname'] = config.pki_hostname - config.pki_master_dict['pki_dns_domainname'] =\ - config.pki_dns_domainname config.pki_master_dict['pki_jython_log_level'] =\ config.pki_jython_log_level config.pki_master_dict['pki_deployment_cfg'] = config.pkideployment_cfg @@ -362,7 +359,6 @@ class PKIConfigParser: # (e. g. Tomcat: "pki-tomcat", "pki-tomcat.example.com") # (e. g. Apache: "pki-apache", "pki-apache.example.com") # - config.pki_master_dict['pki_instance_id'] = config.pki_master_dict['pki_instance_name'] # PKI Source name/value pairs config.pki_master_dict['pki_source_conf_path'] =\ |