summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAeneas Jai├čle <aj@ajaissle.de>2014-02-28 13:05:07 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-02-28 13:05:28 +0100
commit8e29a511ce56f5c142df4dd5daf9797f6e072c4e (patch)
tree4b79a1150b8a3db9ba4f964f5272a5f63f02c2c9
parentd12c31735e6726c503fd09e446cd4e2405ee8d7d (diff)
downloadpykolab-8e29a511ce56f5c142df4dd5daf9797f6e072c4e.tar.gz
setup_ldap knows about
* /usr/sbin/setup-ds-admin.pl * /usr/sbin/setup-ds but it does not know about setup-ds.pl, that comes with upstream 389-ds-base.
-rw-r--r--pykolab/setup/setup_ldap.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 66c5d41..e974c69 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -317,6 +317,8 @@ ServerAdminPwd = %(admin_pass)s
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.pl"):
+ setup_ds_admin = "/usr/sbin/setup-ds.pl"
elif os.path.isfile("/usr/sbin/setup-ds"):
setup_ds_admin = "/usr/sbin/setup-ds"
else: