From df7087813ee2bd14c2c78928b8766c37c579e9c2 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Wed, 14 Nov 2012 00:53:04 -0500 Subject: Refactored config. --- base/deploy/src/scriptlets/selinux_setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'base/deploy/src/scriptlets/selinux_setup.py') diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/deploy/src/scriptlets/selinux_setup.py index 93b48c298..dfa9453db 100644 --- a/base/deploy/src/scriptlets/selinux_setup.py +++ b/base/deploy/src/scriptlets/selinux_setup.py @@ -20,7 +20,6 @@ # # PKI Deployment Imports -import pkiconfig as config from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master from pkiconfig import pki_selinux_config_ports as ports @@ -36,12 +35,14 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 suffix = "(/.*)?" - def restore_context(self): + def restore_context(self, config): + master = config.pki_master_dict selinux.restorecon(master['pki_instance_path'], True) selinux.restorecon(master['pki_instance_log_path'], True) selinux.restorecon(master['pki_instance_configuration_path'], True) - def spawn(self): + def spawn(self, config): + master = config.pki_master_dict if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) @@ -109,7 +110,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): self.restore_context() return self.rv - def destroy(self): + def destroy(self, config): + master = config.pki_master_dict pkilogging.pki_log.info(log.SELINUX_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) -- cgit