summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-07-11 14:23:53 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-07-11 14:23:53 (GMT)
commitbd6da451f9428ae66a7980f5802392fe979c948f (patch)
treea7d436706a4f84e79a86faf64e80d33d3cd9c5be
parent70e35ba03b22d60097c7371084d23bd1944fc069 (diff)
parent69bd973cf52c04c3a0c89a6355190e235c417214 (diff)
downloadpykolab-bd6da451f9428ae66a7980f5802392fe979c948f.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab
-rw-r--r--pykolab/setup/setup_ldap.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 9175cc6..43ed653 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -354,6 +354,32 @@ ServerAdminPwd = %(admin_pass)s
# Do the actual synchronous add-operation to the ldapserver
auth._auth.ldap.add_s(dn, ldif)
+ dn = 'ou=Resources,%s' % (_input['rootdn'])
+
+ # A dict to help build the "body" of the object
+ attrs = {}
+ attrs['objectclass'] = ['top','organizationalunit']
+ attrs['ou'] = "Resources"
+
+ # Convert our dict to nice syntax for the add-function using modlist-module
+ ldif = ldap.modlist.addModlist(attrs)
+
+ # Do the actual synchronous add-operation to the ldapserver
+ auth._auth.ldap.add_s(dn, ldif)
+
+ dn = 'ou=Shared Folders,%s' % (_input['rootdn'])
+
+ # A dict to help build the "body" of the object
+ attrs = {}
+ attrs['objectclass'] = ['top','organizationalunit']
+ attrs['ou'] = "Shared Folders"
+
+ # Convert our dict to nice syntax for the add-function using modlist-module
+ ldif = ldap.modlist.addModlist(attrs)
+
+ # Do the actual synchronous add-operation to the ldapserver
+ auth._auth.ldap.add_s(dn, ldif)
+
log.info(_("Writing out cn=kolab,cn=config"))
dn = 'cn=kolab,cn=config'