summaryrefslogtreecommitdiffstats
path: root/pykolab/setup/setup_ldap.py
diff options
context:
space:
mode:
authorJohannes Graumann <johannes_graumann@web.de>2012-10-15 22:29:10 +0300
committerPaul Klos <kolab@klos2day.nl>2012-10-24 07:18:45 -0400
commit6e49491cdfa359d79a076c9a74179c5b67612bb8 (patch)
tree93c0b710e6802fe01db93431055a6cbb45b03b03 /pykolab/setup/setup_ldap.py
parent45841df53fcc3fafd98265f78068f9b1395853a2 (diff)
downloadpykolab-6e49491cdfa359d79a076c9a74179c5b67612bb8.tar.gz
Debianize: Adapt setup-ds* paths;
Diffstat (limited to 'pykolab/setup/setup_ldap.py')
-rw-r--r--pykolab/setup/setup_ldap.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index b98c85a..c173be4 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -222,11 +222,15 @@ ServerAdminPwd = %(admin_pass)s
os.write(fp, data)
os.close(fp)
- setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
-
- if not os.path.isfile(setup_ds_admin):
- setup_ds_admin = "/usr/sbin/setup-ds-admin"
-
+ if os.path.isfile("/usr/sbin/setup-ds-admin.pl"):
+ setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
+# elif os.path.isfile("/usr/sbin/setup-ds-admin"):
+# setup_ds_admin = "/usr/sbin/setup-ds-admin"
+ elif os.path.isfile("/usr/sbin/setup-ds"):
+ setup_ds_admin = "/usr/sbin/setup-ds"
+ else:
+ log.error(_("No directory server setup tool available."))
+
command = [
setup_ds_admin,
'--debug',