From 698834ee35adbd4b6b95228d27cb515632980d3a Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 8 Dec 2013 01:41:09 +0100
Subject: wibble

---
 .../files/var/lib/ldap/fripost/DB_CONFIG           | 15 +++++++++
 .../templates/etc/ldap/database.ldif.j2            | 36 ++++++----------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/roles/common-LDAP/files/var/lib/ldap/fripost/DB_CONFIG b/roles/common-LDAP/files/var/lib/ldap/fripost/DB_CONFIG
index 0bd4e58..c7072dc 100644
--- a/roles/common-LDAP/files/var/lib/ldap/fripost/DB_CONFIG
+++ b/roles/common-LDAP/files/var/lib/ldap/fripost/DB_CONFIG
@@ -1,3 +1,18 @@
+# It may be a good idea to modify this file, depending on the output of
+#
+#   db_stat -mh /var/lib/ldap/fripost | head -16
+#
+# (For optimal performance, the Requested pages found in the cache
+# should be above 95%, and the dirty/clean pages forced from the cache
+# should be 0.)
+#
+# and
+#
+#   db_stat -ch /var/lib/ldap/fripost | head -16
+#
+# (For optimal performance, usage should be within 85% of the configured
+# values.)
+#
 set_cachesize 0 5242880 1
 # 5MB cachesize, allow defragmentation
 set_lk_max_objects 1500
diff --git a/roles/common-LDAP/templates/etc/ldap/database.ldif.j2 b/roles/common-LDAP/templates/etc/ldap/database.ldif.j2
index b97201c..cf12f10 100644
--- a/roles/common-LDAP/templates/etc/ldap/database.ldif.j2
+++ b/roles/common-LDAP/templates/etc/ldap/database.ldif.j2
@@ -40,6 +40,15 @@ olcRootDN: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth
 #  * Reindex        su openldap -c "slapindex -b 'o=mailHosting,dc=fripost,dc=org'"
 #  * Restart slapd  sudo service slapd start
 #
+#
+# On single- and dual-core systems, change the maximum number of threads
+# to 8. (The default, 16, is fine for 4- and 8-core systems.)
+#
+#     dn: cn=config
+#     changetype: modify
+#     add: olcThreads
+#     olcThreads: 8
+#
 # References
 # - https://wiki.zimbra.com/wiki/OpenLDAP_Performance_Tuning_5.0
 # - http://www.openldap.org/doc/admin24/tuning.html
@@ -55,33 +64,6 @@ olcDbIndex: fripostOptionalMaildrop pres
 olcDbIndex: entryCSN,entryUUID eq
 #
 #
-#
-# 1. On single- and dual-core systems, change the maximum number of
-# threads to 8. (The default, 16, is fine for 4- and 8-core systems.)
-#
-#       dn: cn=config
-#       changetype: modify
-#       add: olcThreads
-#       olcThreads: 8
-#
-#
-# 2. It may be a good idea to modify DB_CONFIG, depending on the output
-# of
-#
-#   db_stat -mh /var/lib/ldap/fripost | head -16
-#
-# (For optimal performance, the Requested pages found in the cache
-# should be above 95%, and the dirty/clean pages forced from the cache
-# should be 0.)
-#
-# and
-#
-#   db_stat -ch /var/lib/ldap/fripost | head -16
-#
-# (For optimal performance, usage should be within 85% of the configured
-# values.)
-#
-#
 ########################################################################
 ########################################################################
 # Sync Replication
-- 
cgit v1.2.3