2 commits - conf/kolab.conf share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Jan 6 11:38:52 CET 2015


 conf/kolab.conf                                  |   33 +++++++++++++++++++++++
 share/templates/roundcubemail/config.inc.php.tpl |    2 -
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 7c459583bc4963f0de36cb85b2fccc5e33fdedfb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jan 6 11:38:35 2015 +0100

    Add documentation on the VLV/SSS configuration

diff --git a/conf/kolab.conf b/conf/kolab.conf
index ea10029..040ced9 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -284,6 +284,39 @@ mailserver_attribute = mailhost
 ;   "j.doe at example.org).
 auth_attributes = mail, alias, uid
 
+; Virtual List View control, and Server-Side Sorting control configuration.
+;
+; Configure these to allow the Web Administration Panel (API) to not have to
+; search a non-database cn=config for the VLV configuration.
+;
+;vlv = [
+;        {
+;                'ou=People,dc=example,dc=org': {
+;                        'scope': 'sub',
+;                        'filter': '(objectclass=inetorgperson)',
+;                        'sort' : [
+;                                [
+;                                        'displayname',
+;                                        'sn',
+;                                        'givenname',
+;                                        'cn'
+;                                    ]
+;                            ]
+;                    }
+;            },
+;        {
+;                'ou=Groups,dc=example,dc=org': {
+;                        'scope': 'sub',
+;                        'filter': '(objectclass=groupofuniquenames)',
+;                        'sort' : [
+;                                [
+;                                        'cn'
+;                                    ]
+;                            ]
+;                    }
+;            },
+;    ]
+
 [kolab_smtp_access_policy]
 cache_uri = mysql://user:pass@localhost/database
 cache_retention = 86400


commit e555b1a3dff3fb4bcf27d3d5871f3a459acc3d4e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jan 1 16:38:08 2015 +0100

    The default for debug_level should be 1 in order to allow error logging to occur (#4104)

diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 15cd25f..77cadab 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -113,7 +113,7 @@
 
     // Re-apply mandatory settings here.
 
-    \$config['debug_level'] = 0;
+    \$config['debug_level'] = 1;
     \$config['devel_mode'] = false;
     \$config['log_driver'] = 'file';
     \$config['log_date_format'] = 'd-M-Y H:i:s,u O';




More information about the commits mailing list