From ef1ad685fd6bc33e744302bb450171c98b1b0739 Mon Sep 17 00:00:00 2001 From: kload Date: Tue, 29 Sep 2015 14:36:46 +0000 Subject: [PATCH] [fix] Indent properly to avoid unwanted differences --- data/templates/slapd/ldap.conf | 12 ++++++------ data/templates/slapd/mailserver.schema | 7 ++++--- data/templates/slapd/slapd.conf | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/data/templates/slapd/ldap.conf b/data/templates/slapd/ldap.conf index bfd86e8ae..406b5c175 100644 --- a/data/templates/slapd/ldap.conf +++ b/data/templates/slapd/ldap.conf @@ -5,14 +5,14 @@ # See ldap.conf(5) for details # This file should be world readable but not world writable. -#BASE dc=example,dc=com -#URI ldap://ldap.example.com ldap://ldap-master.example.com:666 +#BASE dc=example,dc=com +#URI ldap://ldap.example.com ldap://ldap-master.example.com:666 -#SIZELIMIT 12 -#TIMELIMIT 15 -#DEREF never +#SIZELIMIT 12 +#TIMELIMIT 15 +#DEREF never # TLS certificates (needed for GnuTLS) -TLS_CACERT /etc/ssl/certs/ca-certificates.crt +TLS_CACERT /etc/ssl/certs/ca-certificates.crt sudoers_base ou=sudo,dc=yunohost,dc=org diff --git a/data/templates/slapd/mailserver.schema b/data/templates/slapd/mailserver.schema index 55374ce42..23d0d24bd 100644 --- a/data/templates/slapd/mailserver.schema +++ b/data/templates/slapd/mailserver.schema @@ -47,9 +47,10 @@ attributetype ( 1.3.6.1.4.1.40328.1.20.2.6 attributetype ( 1.3.6.1.4.1.40328.1.20.2.7 NAME 'mailuserquota' - DESC 'Mailbox quota for a user in kilo-bytes' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + DESC 'Mailbox quota for a user' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} SINGLE-VALUE ) # Mail Account Objectclass objectclass ( 1.3.6.1.4.1.40328.1.1.2.1 diff --git a/data/templates/slapd/slapd.conf b/data/templates/slapd/slapd.conf index 3b0e3cf2e..e5ac88014 100644 --- a/data/templates/slapd/slapd.conf +++ b/data/templates/slapd/slapd.conf @@ -29,8 +29,8 @@ password-hash {SSHA} loglevel 256 # Where the dynamically loaded modules are stored -modulepath /usr/lib/ldap -moduleload back_hdb +modulepath /usr/lib/ldap +moduleload back_hdb moduleload memberof # The maximum number of entries that is returned for a search operation @@ -44,13 +44,13 @@ tool-threads 1 # Specific Backend Directives for hdb: # Backend specific directives apply to this backend until another # 'backend' directive occurs -backend hdb +backend hdb ####################################################################### # Specific Backend Directives for 'other': # Backend specific directives apply to this backend until another # 'backend' directive occurs -#backend +#backend ####################################################################### # Specific Directives for database #1, of type hdb: @@ -85,7 +85,7 @@ dbconfig set_lk_max_lockers 1500 # Indexing options for database #1 index objectClass eq -index uid eq,sub +index uid eq,sub index entryCSN,entryUUID eq # Save the time that the entry gets modified, for database #1 @@ -96,7 +96,7 @@ lastmod on checkpoint 512 30 # Where to store the replica logs for database #1 -# replogfile /var/lib/ldap/replog +# replogfile /var/lib/ldap/replog # The userPassword by default can be changed # by the entry owning it if they are authenticated. @@ -105,7 +105,7 @@ checkpoint 512 30 # These access lines apply to database #1 only access to attrs=userPassword by dn="cn=admin,dc=yunohost,dc=org" write - by anonymous auth + by anonymous auth by self write by * none @@ -130,8 +130,8 @@ access to dn.base="" by * read # can read everything. access to * by dn="cn=admin,dc=yunohost,dc=org" write - by group/groupOfNames/Member="cn=admin,ou=groups,dc=yunohost,dc=org" write - by * read + by group/groupOfNames/Member="cn=admin,ou=groups,dc=yunohost,dc=org" write + by * read ####################################################################### # Specific Directives for database #2, of type 'other' (can be hdb too): @@ -140,4 +140,4 @@ access to * #database # The base of your directory for database #2 -#suffix "dc=debian,dc=org" +#suffix "dc=debian,dc=org"