From 663f227a5cd8ee4eb2b365d2765b330a9aa60685 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Thu, 18 May 2017 17:23:54 +0200 Subject: [PATCH] adtrust: move SELinux settings to constants SELinux is platform dependend, moving boolean setting to platform module. Reviewed-By: Martin Babinsky --- ipaplatform/base/constants.py | 3 +++ ipaserver/install/adtrustinstance.py | 7 +++---- ipaserver/install/ipa_restore.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ipaplatform/base/constants.py b/ipaplatform/base/constants.py index 8b98b06fe..6592c63d9 100644 --- a/ipaplatform/base/constants.py +++ b/ipaplatform/base/constants.py @@ -27,6 +27,9 @@ class BaseConstantsNamespace(object): ODS_GROUP = "ods" # nfsd init variable used to enable kerberized NFS SECURE_NFS_VAR = "SECURE_NFS" + SELINUX_BOOLEAN_ADTRUST = { + 'samba_portmapper': 'on', + } SELINUX_BOOLEAN_HTTPD = { 'httpd_can_network_connect': 'on', 'httpd_manage_ipa': 'on', diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index b4db05504..66dd6b57b 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -45,6 +45,7 @@ import ipapython.errors import ipaclient.install.ipachangeconf from ipaplatform import services +from ipaplatform.constants import constants from ipaplatform.paths import paths from ipaplatform.tasks import tasks @@ -60,8 +61,6 @@ configuration was not set up properly. Please run ipa-ldap-updater manually and re-run ipa-adtrust-instal again afterwards. """ -SELINUX_BOOLEAN_SETTINGS = {'samba_portmapper': 'on'} - def check_inst(): for smbfile in [paths.SMBD, paths.NET]: @@ -593,7 +592,7 @@ class ADTRUSTInstance(service.Service): def __configure_selinux_for_smbd(self): try: - tasks.set_selinux_booleans(SELINUX_BOOLEAN_SETTINGS, + tasks.set_selinux_booleans(constants.SELINUX_BOOLEAN_ADTRUST, self.backup_state) except ipapython.errors.SetseboolError as e: self.print_msg(e.format_service_warning('adtrust service')) @@ -880,7 +879,7 @@ class ADTRUSTInstance(service.Service): # Restore the state of affected selinux booleans boolean_states = {name: self.restore_state(name) - for name in SELINUX_BOOLEAN_SETTINGS} + for name in constants.SELINUX_BOOLEAN_ADTRUST} try: tasks.set_selinux_booleans(boolean_states) except ipapython.errors.SetseboolError as e: diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index da66e9cbe..f786c746b 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -799,7 +799,7 @@ class Restore(admintool.AdminTool): bools = dict(constants.SELINUX_BOOLEAN_HTTPD) if 'ADTRUST' in self.backup_services: if adtrustinstance: - bools.update(adtrustinstance.SELINUX_BOOLEAN_SETTINGS) + bools.update(constants.SELINUX_BOOLEAN_ADTRUST) else: self.log.error( 'The AD trust package was not found, '