diff options
Diffstat (limited to 'base/deploy/src/scriptlets/selinux_setup.py')
| -rw-r--r-- | base/deploy/src/scriptlets/selinux_setup.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/deploy/src/scriptlets/selinux_setup.py index 2d286fbb6..9c18e355f 100644 --- a/base/deploy/src/scriptlets/selinux_setup.py +++ b/base/deploy/src/scriptlets/selinux_setup.py @@ -25,6 +25,7 @@ from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master from pkiconfig import pki_selinux_config_ports as ports import pkihelper as util +import pkilogging import pkimessages as log import pkiscriptlet import seobject @@ -42,10 +43,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if config.str2bool(master['pki_skip_installation']): - config.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, + pkilogging.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - config.pki_log.info(log.SELINUX_SPAWN_1, __name__, + pkilogging.pki_log.info(log.SELINUX_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # check first if any transactions are required @@ -67,25 +68,25 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): fcon = seobject.fcontextRecords() - config.pki_log.info("adding selinux fcontext \"%s\"", + pkilogging.pki_log.info("adding selinux fcontext \"%s\"", master['pki_instance_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.add(master['pki_instance_path'] + self.suffix, PKIConfig.PKI_INSTANCE_SELINUX_CONTEXT, "", "s0", "") - config.pki_log.info("adding selinux fcontext \"%s\"", + pkilogging.pki_log.info("adding selinux fcontext \"%s\"", master['pki_instance_log_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.add(master['pki_instance_log_path'] + self.suffix, PKIConfig.PKI_LOG_SELINUX_CONTEXT, "", "s0", "") - config.pki_log.info("adding selinux fcontext \"%s\"", + pkilogging.pki_log.info("adding selinux fcontext \"%s\"", master['pki_instance_configuration_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.add(master['pki_instance_configuration_path'] + self.suffix, PKIConfig.PKI_CFG_SELINUX_CONTEXT, "", "s0", "") - config.pki_log.info("adding selinux fcontext \"%s\"", + pkilogging.pki_log.info("adding selinux fcontext \"%s\"", master['pki_database_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.add(master['pki_database_path'] + self.suffix, @@ -93,7 +94,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): portRecords = seobject.portRecords() for port in ports: - config.pki_log.info("adding selinux port %s", port, + pkilogging.pki_log.info("adding selinux port %s", port, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) portRecords.add(port, "tcp", "s0", PKIConfig.PKI_PORT_SELINUX_CONTEXT) @@ -103,13 +104,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv def respawn(self): - config.pki_log.info(log.SELINUX_RESPAWN_1, __name__, + pkilogging.pki_log.info(log.SELINUX_RESPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) self.restore_context() return self.rv def destroy(self): - config.pki_log.info(log.SELINUX_DESTROY_1, __name__, + pkilogging.pki_log.info(log.SELINUX_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # check first if any transactions are required @@ -131,30 +132,30 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): fcon = seobject.fcontextRecords() - config.pki_log.info("deleting selinux fcontext \"%s\"", + pkilogging.pki_log.info("deleting selinux fcontext \"%s\"", master['pki_instance_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.delete(master['pki_instance_path'] + self.suffix , "") - config.pki_log.info("deleting selinux fcontext \"%s\"", + pkilogging.pki_log.info("deleting selinux fcontext \"%s\"", master['pki_instance_log_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.delete(master['pki_instance_log_path'] + self.suffix, "") - config.pki_log.info("deleting selinux fcontext \"%s\"", + pkilogging.pki_log.info("deleting selinux fcontext \"%s\"", master['pki_instance_configuration_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.delete(master['pki_instance_configuration_path'] + \ self.suffix, "") - config.pki_log.info("deleting selinux fcontext \"%s\"", + pkilogging.pki_log.info("deleting selinux fcontext \"%s\"", master['pki_database_path'] + self.suffix, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) fcon.delete(master['pki_database_path'] + self.suffix , "") portRecords = seobject.portRecords() for port in ports: - config.pki_log.info("deleting selinux port %s", port, + pkilogging.pki_log.info("deleting selinux port %s", port, extra=PKIConfig.PKI_INDENTATION_LEVEL_2) portRecords.delete(port, "tcp") |