diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-01-19 14:18:30 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-03-22 10:40:44 +0100 |
| commit | 49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f (patch) | |
| tree | 5a1e7cd570fcd769f2e9dd41daacb49cf769fee4 /ipaplatform | |
| parent | 4f25b296054076abf3d6e44f6b2e7552f993fb1c (diff) | |
| download | freeipa-49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f.tar.gz freeipa-49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f.tar.xz freeipa-49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f.zip | |
Move user/group constants for PKI and DS into ipaplatform
https://fedorahosted.org/freeipa/ticket/5619
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/constants.py | 4 | ||||
| -rw-r--r-- | ipaplatform/redhat/tasks.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ipaplatform/base/constants.py b/ipaplatform/base/constants.py index 50f8a3ed1..52af12429 100644 --- a/ipaplatform/base/constants.py +++ b/ipaplatform/base/constants.py @@ -8,9 +8,13 @@ This base platform module exports platform dependant constants. class BaseConstantsNamespace(object): + DS_USER = 'dirsrv' + DS_GROUP = 'dirsrv' HTTPD_USER = "apache" IPA_DNS_PACKAGE_NAME = "freeipa-server-dns" NAMED_USER = "named" + PKI_USER = 'pkiuser' + PKI_GROUP = 'pkiuser' # ntpd init variable used for daemon options NTPD_OPTS_VAR = "OPTIONS" # quote used for daemon options diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index 638048679..7c29b51e1 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -45,6 +45,7 @@ import ipapython.errors from ipalib import x509 # FIXME: do not import from ipalib +from ipaplatform.constants import constants from ipaplatform.paths import paths from ipaplatform.redhat.authconfig import RedHatAuthConfig from ipaplatform.base.tasks import BaseTaskNamespace @@ -438,14 +439,14 @@ class RedHatTaskNamespace(BaseTaskNamespace): This values should be constant and may be hardcoded. Add other values for other users when needed. """ - if name == 'pkiuser': + if name == constants.PKI_USER: if uid is None: uid = 17 if gid is None: gid = 17 if comment is None: comment = 'CA System User' - if name == 'dirsrv': + if name == constants.DS_USER: if comment is None: comment = 'DS System User' |