From b0d01264e0a5d6a8c1e9fa89e2962b452ca1d67c Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 3 Feb 2024 20:42:23 +1300
Subject: [PATCH] Various tidyups, show some more defaults, make a bit more
 current.

---
 config/example-config.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/config/example-config.php b/config/example-config.php
index 4a4cccdd..0d3f82da 100644
--- a/config/example-config.php
+++ b/config/example-config.php
@@ -680,28 +680,36 @@ $c->admin_email = 'calendar-admin@example.com';
 //     /* Use URI to set one or more LDAP servers to connect to for
 //      * redundancy. Also supports ldaps.
 //      * If no URI string is set, host and port can be used */
-//     'uri' => 'ldaps://hostname:port ldap://hostname2:port2'
+//     'uri'  => 'ldaps://hostname:port ldap://hostname2:port2'
 //     'host' => 'ldap.example.net', // host name of your LDAP Server
 //     'port' => '389',              // port
 
        /* For the initial bind to be anonymous leave bindDN and passDN
         * commented out */
 // DN and password if required to bind to this server for initial queries
-//     'bindDN' => 'cn=manager,cn=internal,dc=example,dc=net',
+//     'bindDN' => 'cn=calendar-manager,ou=users,dc=example,dc=net',
 //     'passDN' => 'xxxxxxxx',
 
 //     'protocolVersion' => '3', // version of LDAP protocol to use
 //     'optReferrals'    => 0,   // whether to automatically follow referrals
 //                               // returned by the LDAP server
 //     'networkTimeout'  => 10,  // timeout in seconds
-//     'baseDNUsers'  => 'dc=example,dc=net',  // where to look at valid user
-        /* filter which must validate a user according to RFC4515, i.e.
-         * surrounded by brackets. Default is (objectClass=*) */
-//     'filterUsers'  => 'objectClass=kolabInetOrgPerson',
+
+       /* where to look for users */
+//     'baseDNUsers'  => 'ou=users,dc=example,dc=net',
+
+       /* filter which must validate a user according to RFC4515, i.e.
+        * surrounded by brackets. Default is (objectClass=*). You
+        * should check what objectClass is used for your user accounts  */
+//     'filterUsers'  => 'objectClass=Person',
+
        /* where to look for groups */
 //     'baseDNGroups' => 'ou=divisions,dc=example,dc=net',
-       /* filter with same rules as filterUsers, and the same default. */
-//     'filterGroups' => 'objectClass=groupOfUniqueNames',
+
+       /* filter with same rules as filterUsers, and the same default. You
+        * should check what is used for your groups. */
+//     'filterGroups' => 'objectClass=groupOfNames',
+
        /* /!\ "username" should be set and "modified" must be set
         * used to create the user based on their ldap properties */
 //     'user_mapping_field' => array(
@@ -710,6 +718,7 @@ $c->admin_email = 'calendar-admin@example.com';
 //         "fullname" => "cn",
 //         "email"    => "mail"
 //     ),
+
        /* used to create the group based on the ldap properties */
 //     'group_mapping_field' => array(
 //         "name"     => "cn",