diff options
Diffstat (limited to 'base/deploy/src/scriptlets/configuration.py')
| -rw-r--r-- | base/deploy/src/scriptlets/configuration.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/deploy/src/scriptlets/configuration.py b/base/deploy/src/scriptlets/configuration.py index 64b7d6eae..c0b5d7b6b 100644 --- a/base/deploy/src/scriptlets/configuration.py +++ b/base/deploy/src/scriptlets/configuration.py @@ -20,10 +20,8 @@ # # PKI Deployment Imports -import pkiconfig as config from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master -from pkiconfig import pki_sensitive_dict as sensitive import pkihelper as util import pkilogging import pkimessages as log @@ -34,7 +32,8 @@ import pkiscriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 - def spawn(self): + def spawn(self, config): + master = config.pki_master_dict if util.str2bool(master['pki_skip_configuration']): pkilogging.pki_log.info(log.SKIP_CONFIGURATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) @@ -53,13 +52,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # allowing 'certutil' to generate the security databases util.password.create_password_conf( master['pki_client_password_conf'], - sensitive['pki_client_database_password'], pin_sans_token=True) + config.pki_sensitive_dict['pki_client_database_password'], pin_sans_token=True) util.file.modify(master['pki_client_password_conf'], uid=0, gid=0) # Similarly, create a simple password file containing the # PKCS #12 password used when exporting the "Admin Certificate" # into a PKCS #12 file - util.password.create_client_pkcs12_password_conf( + util.password.create_client_pkcs12_password_conf(config, master['pki_client_pkcs12_password_conf']) util.file.modify(master['pki_client_pkcs12_password_conf']) util.directory.create(master['pki_client_database_dir'], @@ -95,7 +94,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.systemd.restart() # Pass control to the Java servlet via Jython 2.2 'configuration.jy' - util.jython.invoke(master['pki_jython_configuration_scriptlet']) + util.jython.invoke(config, master['pki_jython_configuration_scriptlet']) return self.rv def respawn(self): @@ -103,7 +102,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - def destroy(self): + def destroy(self, config): + master = config.pki_master_dict pkilogging.pki_log.info(log.CONFIGURATION_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) if master['pki_subsystem'] in PKIConfig.PKI_APACHE_SUBSYSTEMS and\ |