in F7 all directory names have changed from fedora-ds to dirsrv

which should also be the name used in DS 8.0, change all occurences

2 files changed, 14 insertions, 14 deletions

diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index face142a6..2c7e0c7db 100644
--- a/ipa-server/ipaserver/dsinstance.py
+++ b/ipa-server/ipaserver/dsinstance.py
@@ -28,8 +28,8 @@ from util import *
 
 
 SHARE_DIR = "/usr/share/ipa/"
-SERVER_ROOT_64 = "/usr/lib64/fedora-ds-base"
-SERVER_ROOT_32 = "/usr/lib/fedora-ds-base"
+SERVER_ROOT_64 = "/usr/lib64/dirsrv"
+SERVER_ROOT_32 = "/usr/lib/dirsrv"
 
 
 def generate_serverid():
@@ -96,19 +96,19 @@ class DsInstance:
     def config_dirname(self):
         if not self.serverid:
             raise RuntimeError("serverid not set")
-        return "/etc/fedora-ds/slapd-" + self.serverid + "/"
+        return "/etc/dirsrv/slapd-" + self.serverid + "/"
 
     def schema_dirname(self):
         return self.config_dirname() + "/schema/"
 
     def stop(self):
-        run(["/sbin/service", "fedora-ds", "stop"])
+        run(["/sbin/service", "dirsrv", "stop"])
 
     def start(self):
-        run(["/sbin/service", "fedora-ds", "start"])
+        run(["/sbin/service", "dirsrv", "start"])
 
     def restart(self):
-        run(["/sbin/service", "fedora-ds", "restart"])
+        run(["/sbin/service", "dirsrv", "restart"])
 
     def __setup_sub_dict(self):
         suffix = realm_to_suffix(self.realm_name)
@@ -124,7 +124,7 @@ class DsInstance:
             logging.debug("ds user %s exists" % self.ds_user)
 	except KeyError:
             logging.debug("adding ds user %s" % self.ds_user)
-            args = ["/usr/sbin/useradd", "-c", "DS System User", "-d", "/var/lib/fedora-ds", "-M", "-r", "-s", "/sbin/nologin", self.ds_user]
+            args = ["/usr/sbin/useradd", "-c", "DS System User", "-d", "/var/lib/dirsrv", "-M", "-r", "-s", "/sbin/nologin", self.ds_user]
             run(args)
             logging.debug("done adding user")
 
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index b1317f82f..c44cff91a 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -173,17 +173,17 @@ class KrbInstance:
         (kwrite, kread, kerr) = os.popen3("/usr/kerberos/sbin/kadmin.local")
         kwrite.write("addprinc -randkey ldap/"+self.fqdn+"@"+self.realm+"\n")
         kwrite.flush()
-        kwrite.write("ktadd -k /etc/fedora-ds/ds.keytab ldap/"+self.fqdn+"@"+self.realm+"\n")
+        kwrite.write("ktadd -k /etc/dirsrv/ds.keytab ldap/"+self.fqdn+"@"+self.realm+"\n")
         kwrite.flush()
         kwrite.close()
         kread.close()
         kerr.close()
 
-	cfg_fd = open("/etc/sysconfig/fedora-ds", "a")
-        cfg_fd.write("export KRB5_KTNAME=/etc/fedora-ds/ds.keytab\n")
+        cfg_fd = open("/etc/sysconfig/dirsrv", "a")
+        cfg_fd.write("export KRB5_KTNAME=/etc/dirsrv/ds.keytab\n")
         cfg_fd.close()
-	pent = pwd.getpwnam(self.ds_user)
-        os.chown("/etc/sysconfig/fedora-ds", pent.pw_uid, pent.pw_gid)
+        pent = pwd.getpwnam(self.ds_user)
+        os.chown("/etc/sysconfig/dirsrv", pent.pw_uid, pent.pw_gid)
 
     def __export_kadmin_changepw_keytab(self):
         (kwrite, kread, kerr) = os.popen3("/usr/kerberos/sbin/kadmin.local")
@@ -200,10 +200,10 @@ class KrbInstance:
         kread.close()
         kerr.close()
 
-	cfg_fd = open("/etc/sysconfig/ipa-kpasswd", "a")
+        cfg_fd = open("/etc/sysconfig/ipa-kpasswd", "a")
         cfg_fd.write("export KRB5_KTNAME=/var/kerberos/krb5kdc/kpasswd.keytab\n")
         cfg_fd.close()
-	pent = pwd.getpwnam(self.ds_user)
+        pent = pwd.getpwnam(self.ds_user)
         os.chown("/etc/sysconfig/ipa-kpasswd", pent.pw_uid, pent.pw_gid)
 
     def __create_http_keytab(self):