Add User and Group to all ipaplatform.constants

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes
2020-09-15 16:08:02 +02:00
committed by Rob Crittenden
parent b19d20e2db
commit bc128cae47
7 changed files with 28 additions and 6 deletions

View File

@@ -12,6 +12,9 @@ from __future__ import absolute_import
from ipaplatform.base.constants import BaseConstantsNamespace, User, Group
__all__ = ("constants", "User", "Group")
class DebianConstantsNamespace(BaseConstantsNamespace):
HTTPD_USER = User("www-data")
HTTPD_GROUP = Group("www-data")

View File

@@ -9,7 +9,9 @@ This Fedora base platform module exports platform related constants.
# Fallback to default constant definitions
from __future__ import absolute_import
from ipaplatform.redhat.constants import RedHatConstantsNamespace
from ipaplatform.redhat.constants import (
RedHatConstantsNamespace, User, Group
)
from ipaplatform.osinfo import osinfo
# Fedora 28 and earlier use /etc/sysconfig/nfs
@@ -18,6 +20,9 @@ from ipaplatform.osinfo import osinfo
HAS_NFS_CONF = osinfo.version_number >= (30,)
__all__ = ("constants", "User", "Group")
class FedoraConstantsNamespace(RedHatConstantsNamespace):
# Fedora allows installation of Python 2 and 3 mod_wsgi, but the modules
# can't coexist. For Apache to load correct module.

View File

@@ -10,7 +10,10 @@ related constants for the Red Hat OS family-based systems.
# Fallback to default path definitions
from __future__ import absolute_import
from ipaplatform.base.constants import BaseConstantsNamespace
from ipaplatform.base.constants import BaseConstantsNamespace, User, Group
__all__ = ("constants", "User", "Group")
class RedHatConstantsNamespace(BaseConstantsNamespace):

View File

@@ -9,7 +9,9 @@ This RHEL base platform module exports platform related constants.
# Fallback to default constant definitions
from __future__ import absolute_import
from ipaplatform.redhat.constants import RedHatConstantsNamespace
from ipaplatform.redhat.constants import (
RedHatConstantsNamespace, User, Group
)
from ipaplatform.osinfo import osinfo
# RHEL 7 and earlier use /etc/sysconfig/nfs
@@ -17,6 +19,9 @@ from ipaplatform.osinfo import osinfo
HAS_NFS_CONF = osinfo.version_number >= (8,)
__all__ = ("constants", "User", "Group")
class RHELConstantsNamespace(RedHatConstantsNamespace):
IPA_ADTRUST_PACKAGE_NAME = "ipa-server-trust-ad"
IPA_DNS_PACKAGE_NAME = "ipa-server-dns"

View File

@@ -3,7 +3,10 @@
#
"""RHEL container constants
"""
from ipaplatform.rhel.constants import RHELConstantsNamespace
from ipaplatform.rhel.constants import RHELConstantsNamespace, User, Group
__all__ = ("constants", "User", "Group")
class RHELContainerConstantsNamespace(RHELConstantsNamespace):

View File

@@ -11,6 +11,9 @@ related constants for the SUSE OS family-based systems.
from ipaplatform.base.constants import BaseConstantsNamespace, User, Group
__all__ = ("constants", "User", "Group")
class SuseConstantsNamespace(BaseConstantsNamespace):
HTTPD_USER = User("wwwrun")
HTTPD_GROUP = Group("www")

View File

@@ -239,8 +239,8 @@ MANAGER.register_transform(scoped_nodes.ClassDef, fix_ipa_classes)
def ipaplatform_constants_transform():
return AstroidBuilder(MANAGER).string_build(textwrap.dedent('''
from ipaplatform.base.constants import constants
__all__ = ('constants',)
from ipaplatform.base.constants import constants, User, Group
__all__ = ('constants', 'User', 'Group')
'''))