From: Stephen Gran <steve@lobefin.net>
Date: Thu, 29 Dec 2011 21:23:11 +0000 (+0000)
Subject: Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
X-Git-Tag: userdir-ldap-0.3.85~86
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f0572f62c661aaee6222531638257d140891c3c1;hp=0ee5c80a7879b1954f0dc77f9ff8b7b7314e6e19;p=mirror%2Fuserdir-ldap.git

Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
---

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index 7f3cd07..0669580 100644
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -7,6 +7,12 @@ suffix          "@@DN@@"
 # Where the database file are physically stored
 directory       "/var/lib/ldap"
 
+moduleload      accesslog
+overlay accesslog
+logdb cn=log
+logops writes
+logold (objectclass=top)
+
 moduleload      constraint
 overlay constraint
 constraint_attribute keyfingerprint regex ^([0-9A-F]{40})$
@@ -63,7 +69,7 @@ access to attrs=sshrsaauthkey
 access to attrs=activity-pgp,activity-from,dnsZoneEntry,c,l,loginShell,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
 	by peername.ip=127.0.0.1 read
 	by domain=alioth.debian.org none
-	by domain.subtree=@@DOMAIN@@ read
+	by domain.subtree=debian.org read
 	by dn.regex="uid=.*,ou=users,@@DN@@" read
 	by * none
 
@@ -76,3 +82,17 @@ access to attrs=facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCod
 # rest is globally readable
 access to *
 	by * read
+
+
+database hdb
+directory       "/var/lib/ldap-log"
+suffix cn=log
+#
+sizelimit 10000
+
+index reqStart eq
+access to *
+	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
+	by dn="uid=sshdist,ou=users,@@DN@@" read
+	by * none
+