diff options
Diffstat (limited to 'base/deploy/src/scriptlets/pkijython.py')
| -rw-r--r-- | base/deploy/src/scriptlets/pkijython.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py index 8d027f91a..3753c9e49 100644 --- a/base/deploy/src/scriptlets/pkijython.py +++ b/base/deploy/src/scriptlets/pkijython.py @@ -151,6 +151,7 @@ from netscape.security.x509 import X500Name # PKI Python Imports import pkiconfig as config +from pkiconfig import PKIConfig import pkimessages as log @@ -220,7 +221,7 @@ def read_simple_configuration_file(filename): class security_databases: def initialize_token(self, pki_database_path, log_level): try: - if log_level >= config.PKI_JYTHON_INFO_LOG_LEVEL: + if log_level >= PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL: print "%s %s '%s'" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_INITIALIZING_TOKEN, @@ -237,7 +238,7 @@ class security_databases: def log_into_token(self, pki_database_path, password_conf, log_level): token = None try: - if log_level >= config.PKI_JYTHON_INFO_LOG_LEVEL: + if log_level >= PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL: print "%s %s '%s'" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_LOG_INTO_TOKEN, @@ -281,7 +282,7 @@ class rest_client: self.master = master self.sensitive = sensitive log_level = master['pki_jython_log_level'] - if log_level >= config.PKI_JYTHON_INFO_LOG_LEVEL: + if log_level >= PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL: print "%s %s '%s'" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_INITIALIZING_REST_CLIENT, @@ -398,7 +399,7 @@ class rest_client: # Return list of PKI subsystems in the specified tomcat instance rv = [] try: - for subsystem in config.PKI_TOMCAT_SUBSYSTEMS: + for subsystem in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: path = self.master['pki_instance_path'] + "/" + subsystem.lower() if os.path.exists(path) and os.path.isdir(path): rv.append(subsystem) @@ -412,7 +413,7 @@ class rest_client: def construct_pki_configuration_data(self, token): data = None master = self.master - if master['pki_jython_log_level'] >= config.PKI_JYTHON_INFO_LOG_LEVEL: + if master['pki_jython_log_level'] >= PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL: print "%s %s '%s'" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_CONSTRUCTING_PKI_DATA, @@ -547,7 +548,7 @@ class rest_client: def configure_pki_data(self, data): master = self.master - if master['pki_jython_log_level'] >= config.PKI_JYTHON_INFO_LOG_LEVEL: + if master['pki_jython_log_level'] >= PKIConfig.PKI_JYTHON_INFO_LOG_LEVEL: print "%s %s '%s'" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_CONFIGURING_PKI_DATA, @@ -592,7 +593,7 @@ class rest_client: # # os.chmod( # admin_cert_file, - # config.PKI_DEPLOYMENT_DEFAULT_FILE_PERMISSIONS) + # PKIConfig.PKI_DEPLOYMENT_DEFAULT_FILE_PERMISSIONS) # # Emulate it with a system call. command = "chmod" + " 660 " + admin_cert_file @@ -650,7 +651,7 @@ class rest_client: # following operating system specific command: # # os.chmod(master['pki_client_admin_cert_p12'], - # config.\ + # PKIConfig.\ # PKI_DEPLOYMENT_DEFAULT_SECURITY_DATABASE_PERMISSIONS) # # Emulate it with a system call. |