summaryrefslogtreecommitdiffstats
path: root/install/share
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2016-01-19 14:18:30 +0100
committerMartin Basti <mbasti@redhat.com>2016-03-22 10:40:44 +0100
commit49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f (patch)
tree5a1e7cd570fcd769f2e9dd41daacb49cf769fee4 /install/share
parent4f25b296054076abf3d6e44f6b2e7552f993fb1c (diff)
downloadfreeipa-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 'install/share')
-rwxr-xr-xinstall/share/copy-schema-to-ca.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/share/copy-schema-to-ca.py b/install/share/copy-schema-to-ca.py
index 10fd3d740..c2f070aa2 100755
--- a/install/share/copy-schema-to-ca.py
+++ b/install/share/copy-schema-to-ca.py
@@ -19,9 +19,9 @@ from hashlib import sha1
from ipapython import ipautil
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
-from ipaserver.install.dsinstance import DS_USER, schema_dirname
-from ipaserver.install.cainstance import PKI_USER
+from ipaserver.install.dsinstance import schema_dirname
from ipalib import api
+from ipaplatform.constants import constants
try:
from ipaplatform import services
@@ -52,8 +52,8 @@ def _sha1_file(filename):
def add_ca_schema():
"""Copy IPA schema files into the CA DS instance
"""
- pki_pent = pwd.getpwnam(PKI_USER)
- ds_pent = pwd.getpwnam(DS_USER)
+ pki_pent = pwd.getpwnam(constants.PKI_USER)
+ ds_pent = pwd.getpwnam(constants.DS_USER)
for schema_fname in SCHEMA_FILENAMES:
source_fname = os.path.join(ipautil.SHARE_DIR, schema_fname)
target_fname = os.path.join(schema_dirname(SERVERID), schema_fname)