X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap-slapd.conf.in;h=0ac0ec2863367bc07fae3e58161e28ef4eb8e891;hb=87fd84901faae8535d065c420c2b2569e0b6bc20;hp=ba858a9147137bb273fbf9882a9c37f54b2050cf;hpb=d93c2772e9daeb7e0fb904403cf09109445dd272;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index ba858a9..0ac0ec2 100644
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -1,5 +1,5 @@
 # The backend type, ldbm, is the default standard
-database bdb
+database hdb
 
 # The base of your directory
 suffix          "@@DN@@"
@@ -9,7 +9,7 @@ directory       "/var/lib/ldap"
 
 # Indexing options
 index gecos,cn,sn,uid,ircNick,hostname,emailForward pres,eq,sub,approx
-index keyfingerprint,homeDirectory,objectClass,loginShell pres,eq
+index keyfingerprint,homeDirectory,objectClass,loginShell,supplementaryGid pres,eq
 index c,gender,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
 
 # Don't limit queries to the default of 500
@@ -18,23 +18,23 @@ sizelimit 10000
 # Save the time that the entry gets modified
 lastmod on
 
-# owner writeable
-access to attrs=userPassword,sudoPassword
+# LDAP admins have full access, so has sshdist
+access to *
 	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@"  write
+	by dn="uid=sshdist,ou=users,@@DN@@" write
+	by * break
+
+# owner writeable
+access to attrs=userPassword,sudoPassword,bATVToken
 	by self write
 	by * compare
 
 access to attrs=sshrsaauthkey
-	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@"  write
 	by self read
 	by * compare
 
 # debian readable
 access to attrs=activity-pgp,activity-from,dnsZoneEntry
-	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@" write
 	by peername.ip=127.0.0.1 read
 	by domain=alioth.debian.org none
 	by domain.subtree=@@DOMAIN@@ read
@@ -42,9 +42,7 @@ access to attrs=activity-pgp,activity-from,dnsZoneEntry
 	by * none
 
 # owner writeable, debian readable, authenticated user readable
-access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist
-	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@" write
+access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
 	by self write
 	by dn.regex="uid=.*,ou=users,@@DN@@" read
 	by peername.ip=127.0.0.1 read
@@ -54,14 +52,10 @@ access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,bi
 
 # owner writeable, authenticated user readable
 access to attrs=facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,privateSub,latitude,longitude,VoIP
-	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@" write
 	by self write
 	by dn.regex="uid=.*,ou=users,@@DN@@" read
 	by * none
 
 # globally readable
 access to *
-	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@" write
 	by * read