diff options
| author | root <root@borneuni.dk> | 2008-09-16 19:55:15 +0000 |
|---|---|---|
| committer | root <root@borneuni.dk> | 2008-09-16 19:55:15 +0000 |
| commit | ca7d7449d213293e68936fb5d0cd8fec8ab9fbe3 (patch) | |
| tree | f41da5618d17817e3004beabc7da37c00f17d7a1 | |
| parent | b12c8b413837c14d70df7e103fcc61b523f4a1be (diff) | |
| parent | a3a82a7f91fee07e89db8d28a888fe1d396b0d38 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
| -rw-r--r-- | ldap/db/cipux.ldif.in | 6 | ||||
| -rw-r--r-- | ldap/db/horde.ldif.in | 8 | ||||
| -rwxr-xr-x | ldap/mkldapdb | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/ldap/db/cipux.ldif.in b/ldap/db/cipux.ldif.in index cec5396..a7bd302 100644 --- a/ldap/db/cipux.ldif.in +++ b/ldap/db/cipux.ldif.in @@ -1,6 +1,6 @@ -dn: uid=cipux,ou=System,ou=Entities,ou=SAM,@SUFFIX@ +dn: cn=cipux,ou=Entities,ou=Access Control,@SUFFIX@ objectClass: top -objectclass: account +objectclass: organizationalRole objectClass: simpleSecurityObject -uid: cipux +cn: cipux userPassword: superSecretPassword diff --git a/ldap/db/horde.ldif.in b/ldap/db/horde.ldif.in index 0c28f79..00819ca 100644 --- a/ldap/db/horde.ldif.in +++ b/ldap/db/horde.ldif.in @@ -1,11 +1,11 @@ -dn: uid=horde,ou=System,ou=Entities,ou=SAM,@SUFFIX@ +dn: cn=horde,ou=Entities,ou=Access Control,@SUFFIX@ objectClass: top -objectclass: account +objectclass: organizationalRole objectClass: simpleSecurityObject -uid: horde +cn: horde userPassword: superSecretPassword dn: cn=Horde,ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@ objectClass: groupOfUniqueNames cn: Horde -uniqueMember: uid=horde,ou=System,ou=Entities,ou=SAM,@SUFFIX@ +uniqueMember: cn=horde,ou=Entities,ou=Access Control,@SUFFIX@ diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 7469f5d..a1b0742 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -54,8 +54,9 @@ done for section in base cipux horde; do ldapadd -x -h localhost -D "cn=admin,$basedn" -f "$tempdir/$section.ldif" -W 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" +for role in cipux horde; do + echo "Securing $role..." + ldappasswd -x -h localhost -D "cn=admin,$basedn" -S -W "cn=$role,ou=Entities,ou=Access Control,$basedn" done # TODO: Write as function, and create group if not existing @@ -63,5 +64,5 @@ ldapmodify -x -h localhost -D "cn=admin,$basedn" -W <<EOF dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,$basedn changetype: modify add: uniqueMember -uniqueMember: uid=cipux,ou=System,ou=Entities,ou=SAM,$basedn +uniqueMember: cn=cipux,ou=Entities,ou=Access Control,$basedn EOF |