diff options
Diffstat (limited to 'base/deploy/src/scriptlets/pkiparser.py')
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 189 |
1 files changed, 95 insertions, 94 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 821166521..2804e3c42 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -32,6 +32,7 @@ import time # PKI Deployment Imports import pkiconfig as config +from pkiconfig import PKIConfig import pkimessages as log @@ -57,7 +58,7 @@ class PKIConfigParser: mandatory = parser.add_argument_group('mandatory arguments') mandatory.add_argument('-s', dest='pki_subsystem', action='store', - nargs=1, choices=config.PKI_SUBSYSTEMS, + nargs=1, choices=PKIConfig.PKI_SUBSYSTEMS, required=True, metavar='<subsystem>', help='where <subsystem> is ' 'CA, KRA, OCSP, RA, TKS, or TPS') @@ -111,15 +112,15 @@ class PKIConfigParser: config.pki_update_flag = args.pki_update_flag # '-v' if args.pki_verbosity == 1: - config.pki_jython_log_level = config.PKI_JYTHON_INFO_LOG_LEVEL + config.pki_jython_log_level = PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL config.pki_console_log_level = logging.INFO config.pki_log_level = logging.INFO elif args.pki_verbosity == 2: - config.pki_jython_log_level = config.PKI_JYTHON_INFO_LOG_LEVEL + config.pki_jython_log_level = PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL config.pki_console_log_level = logging.INFO config.pki_log_level = logging.DEBUG elif args.pki_verbosity == 3: - config.pki_jython_log_level = config.PKI_JYTHON_DEBUG_LOG_LEVEL + config.pki_jython_log_level = PKIConfig.PKI_JYTHON_DEBUG_LOG_LEVEL config.pki_console_log_level = logging.DEBUG config.pki_log_level = logging.DEBUG elif args.pki_verbosity > 3: @@ -129,7 +130,7 @@ class PKIConfigParser: parser.exit(-1); else: # Set default log levels - config.pki_jython_log_level = config.PKI_JYTHON_WARNING_LOG_LEVEL + config.pki_jython_log_level = PKIConfig.PKI_JYTHON_WARNING_LOG_LEVEL config.pki_console_log_level = logging.WARNING config.pki_log_level = logging.INFO # Process 'Test' command-line options @@ -151,7 +152,7 @@ class PKIConfigParser: if config.pki_deployment_executable == 'pkidestroy': # verify that previously deployed instance exists deployed_pki_instance_path = config.pki_root_prefix +\ - config.PKI_DEPLOYMENT_BASE_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_BASE_ROOT + "/" +\ config.pki_deployed_instance_name if not os.path.exists(deployed_pki_instance_path): print "ERROR: " + log.PKI_INSTANCE_DOES_NOT_EXIST_1 %\ @@ -171,7 +172,7 @@ class PKIConfigParser: deployed_pki_subsystem_path + "/" +\ "registry" + "/" +\ config.pki_subsystem.lower() + "/" +\ - config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + PKIConfig.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE # always verify that configuration file exists if not os.path.exists(config.pkideployment_cfg) or\ not os.path.isfile(config.pkideployment_cfg): @@ -321,14 +322,14 @@ class PKIConfigParser: config.pki_master_dict['pki_instance_name'] # PKI Source name/value pairs config.pki_master_dict['pki_source_conf_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT, config.pki_master_dict['pki_subsystem'].lower(), "conf") config.pki_master_dict['pki_source_setup_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT, "setup") config.pki_master_dict['pki_source_server_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT, "server", "conf") config.pki_master_dict['pki_source_cs_cfg'] =\ @@ -338,43 +339,43 @@ class PKIConfigParser: os.path.join(config.pki_master_dict['pki_source_setup_path'], "pkidaemon_registry") if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_APACHE_SUBSYSTEMS: + PKIConfig.PKI_APACHE_SUBSYSTEMS: config.pki_master_dict['pki_systemd_service'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ "pki-apached" + "@" + ".service" config.pki_master_dict['pki_systemd_target'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ "pki-apached.target" config.pki_master_dict['pki_systemd_target_wants'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\ "pki-apached.target.wants" config.pki_master_dict['pki_systemd_service_link'] =\ config.pki_master_dict['pki_systemd_target_wants'] + "/" +\ "pki-apached" + "@" +\ config.pki_master_dict['pki_instance_id'] + ".service" elif config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['pki_systemd_service'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ "pki-tomcatd" + "@" + ".service" config.pki_master_dict['pki_systemd_target'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\ "pki-tomcatd.target" config.pki_master_dict['pki_systemd_target_wants'] =\ - config.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\ + PKIConfig.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\ "pki-tomcatd.target.wants" config.pki_master_dict['pki_systemd_service_link'] =\ config.pki_master_dict['pki_systemd_target_wants'] + "/" +\ "pki-tomcatd" + "@" +\ config.pki_master_dict['pki_instance_id'] + ".service" config.pki_master_dict['pki_tomcat_bin_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_TOMCAT_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_TOMCAT_ROOT, "bin") config.pki_master_dict['pki_tomcat_lib_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_TOMCAT_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_TOMCAT_ROOT, "lib") config.pki_master_dict['pki_tomcat_systemd'] =\ - config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD + PKIConfig.PKI_DEPLOYMENT_TOMCAT_SYSTEMD config.pki_master_dict['pki_source_catalina_properties'] =\ os.path.join(config.pki_master_dict['pki_source_server_path'], "catalina.properties") @@ -392,14 +393,14 @@ class PKIConfigParser: "tomcat.conf") if config.pki_master_dict['pki_subsystem'] == "CA": config.pki_master_dict['pki_source_emails'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT, "ca", "emails") config.pki_master_dict['pki_source_flatfile_txt'] =\ os.path.join(config.pki_master_dict['pki_source_conf_path'], "flatfile.txt") config.pki_master_dict['pki_source_profiles'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT, "ca", "profiles") config.pki_master_dict['pki_source_proxy_conf'] =\ @@ -462,16 +463,16 @@ class PKIConfigParser: config.pki_master_dict['pki_root_prefix'] = config.pki_root_prefix config.pki_master_dict['pki_path'] =\ config.pki_master_dict['pki_root_prefix'] +\ - config.PKI_DEPLOYMENT_BASE_ROOT + PKIConfig.PKI_DEPLOYMENT_BASE_ROOT config.pki_master_dict['pki_log_path'] =\ config.pki_master_dict['pki_root_prefix'] +\ - config.PKI_DEPLOYMENT_LOG_ROOT + PKIConfig.PKI_DEPLOYMENT_LOG_ROOT config.pki_master_dict['pki_configuration_path'] =\ config.pki_master_dict['pki_root_prefix'] +\ - config.PKI_DEPLOYMENT_CONFIGURATION_ROOT + PKIConfig.PKI_DEPLOYMENT_CONFIGURATION_ROOT config.pki_master_dict['pki_registry_path'] =\ config.pki_master_dict['pki_root_prefix'] +\ - config.PKI_DEPLOYMENT_REGISTRY_ROOT + PKIConfig.PKI_DEPLOYMENT_REGISTRY_ROOT # Apache/Tomcat instance base name/value pairs config.pki_master_dict['pki_instance_path'] =\ os.path.join(config.pki_master_dict['pki_path'], @@ -487,7 +488,7 @@ class PKIConfigParser: # Apache/Tomcat instance registry name/value pairs # Apache-specific instance name/value pairs if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_APACHE_SUBSYSTEMS: + PKIConfig.PKI_APACHE_SUBSYSTEMS: # Apache instance base name/value pairs config.pki_master_dict['pki_instance_type'] = "Apache" # Apache instance log name/value pairs @@ -504,7 +505,7 @@ class PKIConfigParser: # Apache instance convenience symbolic links # Tomcat-specific instance name/value pairs elif config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # Tomcat instance base name/value pairs config.pki_master_dict['pki_instance_type'] = "Tomcat" config.pki_master_dict['pki_tomcat_common_path'] =\ @@ -594,87 +595,87 @@ class PKIConfigParser: os.path.join("/usr/lib/java", "symkey.jar") config.pki_master_dict['pki_apache_commons_collections_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "apache-commons-collections.jar") config.pki_master_dict['pki_apache_commons_lang_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "apache-commons-lang.jar") config.pki_master_dict['pki_apache_commons_logging_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "apache-commons-logging.jar") config.pki_master_dict['pki_commons_codec_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "commons-codec.jar") config.pki_master_dict['pki_httpclient_jar'] =\ os.path.join( - config.PKI_DEPLOYMENT_HTTPCOMPONENTS_JAR_SOURCE_ROOT, + PKIConfig.PKI_DEPLOYMENT_HTTPCOMPONENTS_JAR_SOURCE_ROOT, "httpclient.jar") config.pki_master_dict['pki_httpcore_jar'] =\ os.path.join( - config.PKI_DEPLOYMENT_HTTPCOMPONENTS_JAR_SOURCE_ROOT, + PKIConfig.PKI_DEPLOYMENT_HTTPCOMPONENTS_JAR_SOURCE_ROOT, "httpcore.jar") config.pki_master_dict['pki_javassist_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "javassist.jar") config.pki_master_dict['pki_resteasy_jaxrs_api_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, "jaxrs-api.jar") config.pki_master_dict['pki_jettison_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "jettison.jar") config.pki_master_dict['pki_ldapjdk_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "ldapjdk.jar") config.pki_master_dict['pki_certsrv_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-certsrv.jar") config.pki_master_dict['pki_cmsbundle'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-cmsbundle.jar") config.pki_master_dict['pki_cmscore'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-cmscore.jar") config.pki_master_dict['pki_cms'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-cms.jar") config.pki_master_dict['pki_cmsutil'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-cmsutil.jar") config.pki_master_dict['pki_nsutil'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-nsutil.jar") config.pki_master_dict['pki_tomcat_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-tomcat.jar") config.pki_master_dict['pki_resteasy_atom_provider_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, "resteasy-atom-provider.jar") config.pki_master_dict['pki_resteasy_jaxb_provider_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, "resteasy-jaxb-provider.jar") config.pki_master_dict['pki_resteasy_jaxrs_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, "resteasy-jaxrs.jar") config.pki_master_dict['pki_resteasy_jettison_provider_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_RESTEASY_JAR_SOURCE_ROOT, "resteasy-jettison-provider.jar") config.pki_master_dict['pki_scannotation_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "scannotation.jar") config.pki_master_dict['pki_tomcatjss_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "tomcat7jss.jar") config.pki_master_dict['pki_velocity_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "velocity.jar") config.pki_master_dict['pki_xerces_j2_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "xerces-j2.jar") config.pki_master_dict['pki_xml_commons_apis_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "xml-commons-apis.jar") config.pki_master_dict['pki_xml_commons_resolver_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_JAR_SOURCE_ROOT, "xml-commons-resolver.jar") # Tomcat instance common lib jar symbolic links config.pki_master_dict['pki_jss_jar_link'] =\ @@ -806,7 +807,7 @@ class PKIConfigParser: config.pki_master_dict['pki_subsystem'].lower()) # Instance-based Apache/Tomcat PKI subsystem name/value pairs if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_APACHE_SUBSYSTEMS: + PKIConfig.PKI_APACHE_SUBSYSTEMS: # Instance-based Apache PKI subsystem base name/value pairs # Instance-based Apache PKI subsystem log name/value pairs if config.pki_master_dict['pki_subsystem'] == "TPS": @@ -817,7 +818,7 @@ class PKIConfigParser: # Instance-based Apache PKI subsystem registry name/value pairs # Instance-based Apache PKI subsystem convenience symbolic links elif config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # Instance-based Tomcat PKI subsystem base name/value pairs if config.pki_master_dict['pki_subsystem'] == "CA": config.pki_master_dict['pki_subsystem_emails_path'] =\ @@ -851,7 +852,7 @@ class PKIConfigParser: "registry") # PKI Target (war file) name/value pairs if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # Tomcat PKI subsystem war file base name/value pairs config.pki_master_dict['pki_tomcat_webapps_subsystem_path'] =\ os.path.join(config.pki_master_dict['pki_tomcat_webapps_path'], @@ -895,7 +896,7 @@ class PKIConfigParser: # Tomcat PKI subsystem war file convenience symbolic links if config.pki_master_dict['pki_subsystem'] == "CA": config.pki_master_dict['pki_ca_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-ca.jar") config.pki_master_dict['pki_ca_jar_link'] =\ os.path.join( @@ -904,7 +905,7 @@ class PKIConfigParser: "pki-ca.jar") elif config.pki_master_dict['pki_subsystem'] == "KRA": config.pki_master_dict['pki_kra_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-kra.jar") config.pki_master_dict['pki_kra_jar_link'] =\ os.path.join( @@ -913,7 +914,7 @@ class PKIConfigParser: "pki-kra.jar") elif config.pki_master_dict['pki_subsystem'] == "OCSP": config.pki_master_dict['pki_ocsp_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-ocsp.jar") config.pki_master_dict['pki_ocsp_jar_link'] =\ os.path.join( @@ -922,7 +923,7 @@ class PKIConfigParser: "pki-ocsp.jar") elif config.pki_master_dict['pki_subsystem'] == "TKS": config.pki_master_dict['pki_tks_jar'] =\ - os.path.join(config.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, + os.path.join(PKIConfig.PKI_DEPLOYMENT_PKI_JAR_SOURCE_ROOT, "pki-tks.jar") config.pki_master_dict['pki_tks_jar_link'] =\ os.path.join( @@ -938,7 +939,7 @@ class PKIConfigParser: os.path.join(config.pki_master_dict['pki_instance_registry_path'], config.pki_master_dict['pki_instance_id']) if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['pki_target_catalina_properties'] =\ os.path.join( config.pki_master_dict['pki_instance_configuration_path'], @@ -1060,7 +1061,7 @@ class PKIConfigParser: os.path.join(config.pki_master_dict['pki_subsystem_registry_path'], config.pki_master_dict['pki_instance_id']) if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_APACHE_SUBSYSTEMS: + PKIConfig.PKI_APACHE_SUBSYSTEMS: config.pki_master_dict['FORTITUDE_APACHE_SLOT'] = None config.pki_master_dict['FORTITUDE_AUTH_MODULES_SLOT'] = None config.pki_master_dict['FORTITUDE_DIR_SLOT'] = None @@ -1091,7 +1092,7 @@ class PKIConfigParser: config.pki_master_dict['TMP_DIR_SLOT'] = None config.pki_master_dict['TPS_DIR_SLOT'] = None elif config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['INSTALL_TIME_SLOT'] =\ config.pki_master_dict['pki_install_time'] config.pki_master_dict['PKI_ADMIN_SECURE_PORT_SLOT'] =\ @@ -1425,24 +1426,24 @@ class PKIConfigParser: config.pki_master_dict['pki_security_domain_user'] = "caadmin" if not len(config.pki_master_dict['pki_subsystem_name']): if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS and \ + PKIConfig.PKI_TOMCAT_SUBSYSTEMS and \ config.str2bool(config.pki_master_dict['pki_clone']): config.pki_master_dict['pki_subsystem_name'] =\ - config.PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM + " " +\ + PKIConfig.PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM + " " +\ config.pki_subsystem + " " +\ config.pki_master_dict['pki_hostname'] + " " +\ config.pki_master_dict['pki_https_port'] elif config.pki_subsystem == "CA" and \ config.str2bool(config.pki_master_dict['pki_external']): config.pki_master_dict['pki_subsystem_name'] =\ - config.PKI_DEPLOYMENT_EXTERNAL_CA + " " +\ + PKIConfig.PKI_DEPLOYMENT_EXTERNAL_CA + " " +\ config.pki_subsystem + " " +\ config.pki_master_dict['pki_hostname'] + " " +\ config.pki_master_dict['pki_https_port'] elif config.pki_subsystem == "CA" and \ config.str2bool(config.pki_master_dict['pki_subordinate']): config.pki_master_dict['pki_subsystem_name'] =\ - config.PKI_DEPLOYMENT_SUBORDINATE_CA + " " +\ + PKIConfig.PKI_DEPLOYMENT_SUBORDINATE_CA + " " +\ config.pki_subsystem + " " +\ config.pki_master_dict['pki_hostname'] + " " +\ config.pki_master_dict['pki_https_port'] @@ -1611,7 +1612,7 @@ class PKIConfigParser: config.pki_master_dict['pki_admin_name'] + "@" +\ config.pki_master_dict['pki_dns_domainname'] if not len(config.pki_master_dict['pki_admin_nickname']): - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: if config.pki_master_dict['pki_subsystem'] == "RA": # PKI RA config.pki_master_dict['pki_admin_nickname'] =\ @@ -1624,7 +1625,7 @@ class PKIConfigParser: "TPS Administrator's" + " " +\ config.pki_master_dict['pki_security_domain_name'] +\ " " + "ID" - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "CA": if config.str2bool( @@ -1668,7 +1669,7 @@ class PKIConfigParser: config.pki_master_dict['pki_security_domain_name']\ + " " + "ID" if not len(config.pki_master_dict['pki_admin_subject_dn']): - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: if config.pki_master_dict['pki_subsystem'] == "RA": # PKI RA config.pki_master_dict['pki_admin_subject_dn'] =\ @@ -1687,7 +1688,7 @@ class PKIConfigParser: config.pki_master_dict['pki_admin_email'] +\ "," + "o=" +\ config.pki_master_dict['pki_security_domain_name'] - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "CA": if config.str2bool( @@ -1769,7 +1770,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_ca_signing_subject_dn'] # config.pki_master_dict['pki_ca_signing_token'] # - if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "CA": # config.pki_master_dict['pki_ca_signing_nickname'] @@ -1838,7 +1839,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_ocsp_signing_subject_dn'] # config.pki_master_dict['pki_ocsp_signing_token'] # - if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "CA": if not len(config.pki_master_dict\ @@ -1932,13 +1933,13 @@ class PKIConfigParser: "Server-Cert" + " " + "cert-" +\ config.pki_master_dict['pki_instance_id'] if not len(config.pki_master_dict['pki_ssl_server_subject_dn']): - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: config.pki_master_dict['pki_ssl_server_subject_dn'] =\ "cn=" + config.pki_master_dict['pki_hostname'] +\ "," + "ou=" + config.pki_master_dict['pki_instance_id'] +\ "," + "o=" +\ config.pki_master_dict['pki_security_domain_name'] - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if config.pki_master_dict['pki_subsystem'] == "CA" and\ config.str2bool(config.pki_master_dict['pki_external']): # External CA @@ -1981,7 +1982,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_subsystem_subject_dn'] # config.pki_master_dict['pki_subsystem_token'] # - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: if not len(config.pki_master_dict['pki_subsystem_nickname']): config.pki_master_dict['pki_subsystem_nickname'] =\ "subsystemCert" + " " + "cert-" +\ @@ -2006,7 +2007,7 @@ class PKIConfigParser: if not len(config.pki_master_dict['pki_subsystem_token']): config.pki_master_dict['pki_subsystem_token'] =\ "Internal Key Storage Token" - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if not len(config.pki_master_dict['pki_subsystem_nickname']): config.pki_master_dict['pki_subsystem_nickname'] =\ @@ -2087,7 +2088,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_audit_signing_subject_dn'] # config.pki_master_dict['pki_audit_signing_token'] # - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: if config.pki_master_dict['pki_subsystem'] != "RA": if not len(config.pki_master_dict\ ['pki_audit_signing_nickname']): @@ -2107,7 +2108,7 @@ class PKIConfigParser: if not len(config.pki_master_dict['pki_audit_signing_token']): config.pki_master_dict['pki_audit_signing_token'] =\ "Internal Key Storage Token" - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if not len(config.pki_master_dict\ ['pki_audit_signing_nickname']): @@ -2188,7 +2189,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_transport_subject_dn'] # config.pki_master_dict['pki_transport_token'] # - if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "KRA": # PKI KRA @@ -2233,7 +2234,7 @@ class PKIConfigParser: # config.pki_master_dict['pki_storage_subject_dn'] # config.pki_master_dict['pki_storage_token'] # - if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if not config.str2bool(config.pki_master_dict['pki_clone']): if config.pki_master_dict['pki_subsystem'] == "KRA": # PKI KRA @@ -2256,16 +2257,16 @@ class PKIConfigParser: # Finalization name/value pairs config.pki_master_dict['pki_deployment_cfg_replica'] =\ os.path.join(config.pki_master_dict['pki_subsystem_registry_path'], - config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE) + PKIConfig.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE) config.pki_master_dict['pki_deployment_cfg_spawn_archive'] =\ config.pki_master_dict['pki_subsystem_archive_log_path'] + "/" +\ "spawn" + "_" +\ - config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + "." +\ + PKIConfig.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + "." +\ config.pki_master_dict['pki_timestamp'] config.pki_master_dict['pki_deployment_cfg_respawn_archive'] =\ config.pki_master_dict['pki_subsystem_archive_log_path'] + "/" +\ "respawn" + "_" +\ - config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + "." +\ + PKIConfig.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + "." +\ config.pki_master_dict['pki_timestamp'] config.pki_master_dict['pki_manifest'] =\ config.pki_master_dict['pki_subsystem_registry_path'] + "/" +\ @@ -2295,14 +2296,14 @@ class PKIConfigParser: config.pki_sensitive_dict['pki_one_time_pin']) # Compose this "systemd" execution management command if config.pki_master_dict['pki_subsystem'] in\ - config.PKI_APACHE_SUBSYSTEMS: + PKIConfig.PKI_APACHE_SUBSYSTEMS: config.pki_master_dict['pki_registry_initscript_command'] =\ "systemctl" + " " +\ "restart" + " " +\ "pki-apached" + "@" +\ config.pki_master_dict['pki_instance_id'] + "." + "service" elif config.pki_master_dict['pki_subsystem'] in\ - config.PKI_TOMCAT_SUBSYSTEMS: + PKIConfig.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['pki_registry_initscript_command'] =\ "systemctl" + " " +\ "restart" + " " +\ @@ -2310,11 +2311,11 @@ class PKIConfigParser: config.pki_master_dict['pki_instance_id'] + "." + "service" except OSError as exc: config.pki_log.error(log.PKI_OSERROR_1, exc, - extra=config.PKI_INDENTATION_LEVEL_2) + extra=PKIConfig.PKI_INDENTATION_LEVEL_2) sys.exit(1) except KeyError as err: config.pki_log.error(log.PKIHELPER_DICTIONARY_MASTER_MISSING_KEY_1, - err, extra=config.PKI_INDENTATION_LEVEL_2) + err, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) sys.exit(1) return @@ -2328,11 +2329,11 @@ class PKIConfigParser: parser = ConfigParser.ConfigParser() # Make keys case-sensitive! parser.optionxform = str - parser.read(config.PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE) + parser.read(PKIConfig.PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE) # Slots configuration file name/value pairs - if config.pki_subsystem in config.PKI_APACHE_SUBSYSTEMS: + if config.pki_subsystem in PKIConfig.PKI_APACHE_SUBSYSTEMS: config.pki_slots_dict = dict(parser._sections['Apache']) - elif config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + elif config.pki_subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: config.pki_slots_dict = dict(parser._sections['Tomcat']) except ConfigParser.ParsingError, err: rv = err |