summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.py
diff options
context:
space:
mode:
authorGabe <redhatrises@gmail.com>2014-10-03 17:27:57 -0600
committerPetr Viktorin <pviktori@dhcp-31-13.brq.redhat.com>2014-11-04 12:57:01 +0100
commit7eca640ffa3e661140843d91dc4a846d3355a242 (patch)
treef4c76b3f16e07d0efd83c9a332d7f7fbb8697744 /ipaserver/install/dsinstance.py
parent42724a4b22f9c7025254c875e9f8fcba17f8b9bf (diff)
downloadfreeipa-7eca640ffa3e661140843d91dc4a846d3355a242.tar.gz
freeipa-7eca640ffa3e661140843d91dc4a846d3355a242.tar.xz
freeipa-7eca640ffa3e661140843d91dc4a846d3355a242.zip
Remove trivial path constants from modules
https://fedorahosted.org/freeipa/ticket/4399 Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index d1569697c..6fcf916ca 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -45,9 +45,6 @@ from ipapython.dn import DN
from ipaplatform import services
from ipaplatform.paths import paths
-SERVER_ROOT_64 = paths.USR_LIB_DIRSRV_64
-SERVER_ROOT_32 = paths.USR_LIB_DIRSRV
-
DS_USER = 'dirsrv'
DS_GROUP = 'dirsrv'
@@ -70,10 +67,10 @@ ALL_SCHEMA_FILES = IPA_SCHEMA_FILES + ("05rfc2247.ldif", )
def find_server_root():
- if ipautil.dir_exists(SERVER_ROOT_64):
- return SERVER_ROOT_64
+ if ipautil.dir_exists(paths.USR_LIB_DIRSRV_64):
+ return paths.USR_LIB_DIRSRV_64
else:
- return SERVER_ROOT_32
+ return paths.USR_LIB_DIRSRV
def realm_to_serverid(realm_name):
return "-".join(realm_name.split("."))