summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@borneuni.dk>2008-09-16 19:29:17 +0000
committerroot <root@borneuni.dk>2008-09-16 19:29:17 +0000
commitb12c8b413837c14d70df7e103fcc61b523f4a1be (patch)
tree166c46f95092c171410c1b61b40f71ad85856c32
parenta9c1c5a56bf88e600845f6de81d726b043315f9f (diff)
parentfb7d602122d8e6ef97f81056967d909f42a7f2f7 (diff)
Merge branch 'master' of git://source.jones.dk/local-COMMON
-rw-r--r--ldap/db/base.ldif.in18
-rwxr-xr-xldap/mkldapdb2
2 files changed, 13 insertions, 7 deletions
diff --git a/ldap/db/base.ldif.in b/ldap/db/base.ldif.in
index ee28e12..04e39d1 100644
--- a/ldap/db/base.ldif.in
+++ b/ldap/db/base.ldif.in
@@ -59,18 +59,22 @@ dn: ou=Groups,ou=Access Control,@SUFFIX@
objectClass: organizationalUnit
ou: Groups
-dn: cn=Replicants,ou=Groups,ou=Access Control,@SUFFIX@
-objectClass: groupOfUniqueNames
-cn: Replicants
+# Empty groups not permitted - create as needed instead
+#
+#dn: cn=Replicants,ou=Groups,ou=Access Control,@SUFFIX@
+#objectClass: groupOfUniqueNames
+#cn: Replicants
dn: ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
objectClass: organizationalUnit
ou: Administrators
-dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
-objectClass: groupOfUniqueNames
-cn: DSA
-description: Directory System Agent administrators
+# Empty groups not permitted - create as needed instead
+#
+#dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
+#objectClass: groupOfUniqueNames
+#cn: DSA
+#description: Directory System Agent administrators
dn: ou=Entities,ou=Access Control,@SUFFIX@
objectClass: organizationalUnit
diff --git a/ldap/mkldapdb b/ldap/mkldapdb
index 697f7cd..7469f5d 100755
--- a/ldap/mkldapdb
+++ b/ldap/mkldapdb
@@ -57,6 +57,8 @@ done
for section in cipux horde; do
ldappasswd -x -h localhost -D "cn=admin,$basedn" -S -W "uid=$section,ou=System,ou=Entities,ou=SAM,$basedn"
done
+
+# TODO: Write as function, and create group if not existing
ldapmodify -x -h localhost -D "cn=admin,$basedn" -W <<EOF
dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,$basedn
changetype: modify