2 files changed, 18 insertions, 68 deletions
diff --git a/ipa-install/src/ipa/dsinstance.py b/ipa-install/src/ipa/dsinstance.py
index a4abfc8aa..b16aa7c51 100644
--- a/ipa-install/src/ipa/dsinstance.py
+++ b/ipa-install/src/ipa/dsinstance.py
@@ -25,8 +25,14 @@ import shutil
 import logging
 import pwd
 import os
+import stat
+from util import *
+
 
 SHARE_DIR = "/usr/share/ipa/"
+SERVER_ROOT_64 = "/usr/lib64/fedora-ds-base"
+SERVER_ROOT_32 = "/usr/lib/fedora-ds-base"
+
 
 def generate_serverid():
     """Generate a UUID (universally unique identifier) suitable
@@ -45,39 +51,20 @@ def realm_to_suffix(realm_name):
     terms = ["dc=" + x.lower() for x in s]
     return ",".join(terms)
 
-def template_str(txt, vars):
-    return string.Template(txt).substitute(vars)
-
-def template_file(infilename, vars):
-    txt = open(infilename).read()
-    return template_str(txt, vars)
-
-def write_tmp_file(txt):
-    fd = tempfile.NamedTemporaryFile()
-    fd.write(txt)
-    fd.flush()
-
-    return fd
-
-def run(args, stdin=None):
-    logging.debug("running command [%s]" % (" ".join(args)))
-    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if stdin:
-        stdout,stderr = p.communicate(stdin)
-    else:
-        stdout,stderr = p.communicate()
-    logging.info(stdout)
-    logging.info(stderr)
+def find_server_root():
+    try:
+        mode = os.stat(SERVER_ROOT_64)[ST_MODE]
+        if stat.IS_DIR(mode):
+            return SERVER_ROOT_64
+    except:
+        return SERVER_ROOT_32
 
-    if p.returncode != 0:
-        raise subprocess.CalledProcessError(p.returncode, args[0])
-    
 
 INF_TEMPLATE = """
 [General]
 FullMachineName=   $FQHN
 SuiteSpotUserID=   $USER
-ServerRoot=    /usr/lib/fedora-ds-base
+ServerRoot=    $SERVER_ROOT
 [slapd]
 ServerPort=   389
 ServerIdentifier=   $SERVERID
@@ -103,7 +90,6 @@ class DsInstance:
         self.__setup_sub_dict()
 
         self.__create_ds_user()
-        self.__set_ds_perms()
         self.__create_instance()
         self.__add_default_schemas()
         self.__enable_ssl()
@@ -129,9 +115,11 @@ class DsInstance:
 
     def __setup_sub_dict(self):
         suffix = realm_to_suffix(self.realm_name)
+        server_root = find_server_root()
         self.sub_dict = dict(FQHN=self.host_name, SERVERID=self.serverid,
                              PASSWORD=self.admin_password, SUFFIX=suffix,
-                             REALM=self.realm_name, USER=self.ds_user)
+                             REALM=self.realm_name, USER=self.ds_user,
+                             SERVER_ROOT=server_root)
 
     def __create_ds_user(self):
 	try:
@@ -143,12 +131,6 @@ class DsInstance:
             run(args)
             logging.debug("done adding user")
 
-    def __set_ds_perms(self):
-        p = pwd.getpwnam(self.ds_user)
-        uid = p.pw_uid
-        gid = p.pg_gid
-        os.chown("/var/tmp/fedora-ds", uid, gid)
-
     def __create_instance(self):
         logging.debug("creating ds instance . . . ")
         inf_txt = template_str(INF_TEMPLATE, self.sub_dict)
diff --git a/ipa-install/src/ipa/krbinstance.py b/ipa-install/src/ipa/krbinstance.py
index e10f9c7a7..253c506f2 100644
--- a/ipa-install/src/ipa/krbinstance.py
+++ b/ipa-install/src/ipa/krbinstance.py
@@ -28,13 +28,7 @@ from time import gmtime
 import os
 import pwd
 import socket
-
-SHARE_DIR = "/usr/share/ipa/"
-
-def realm_to_suffix(realm_name):
-    s = realm_name.split(".")
-    terms = ["dc=" + x.lower() for x in s]
-    return ",".join(terms)
+from util import *
 
 def host_to_domain(fqdn):
     s = fqdn.split(".")
@@ -49,36 +43,10 @@ def generate_kdc_password():
         rndpwd += chr(r.randint(65,90)) #stricter set for testing
     return rndpwd
 
-def template_str(txt, vars):
-    return string.Template(txt).substitute(vars)
-
-def template_file(infilename, vars):
-    txt = open(infilename).read()
-    return template_str(txt, vars)
-
-def write_tmp_file(txt):
-    fd = tempfile.NamedTemporaryFile()
-    fd.write(txt)
-    fd.flush()
-
-    return fd
-
 def ldap_mod(fd, dn, pwd):
     args = ["/usr/bin/ldapmodify", "-h", "127.0.0.1", "-xv", "-D", dn, "-w", pwd, "-f", fd.name]
     run(args)
 
-def run(args, stdin=None):
-    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if stdin:
-        stdout,stderr = p.communicate(stdin)
-    else:
-        stdout,stderr = p.communicate()
-    logging.info(stdout)
-    logging.info(stderr)
-
-    if p.returncode != 0:
-        raise subprocess.CalledProcessError(p.returncode, args[0])
-    
 class KrbInstance:
     def __init__(self):
         self.ds_user = None