2 commits - pykolab/setup share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Aug 14 13:39:06 CEST 2014


 pykolab/setup/setup_freebusy.py                    |    2 +-
 share/templates/roundcubemail/password.inc.php.tpl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b35567b8e2c24c69f56eb59b986e3f4f6c04be12
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 14 13:38:57 2014 +0200

    kolab-users -> kolab-people

diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index ff15293..dfabab5 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -91,7 +91,7 @@ def execute(*args, **kw):
                     'fbsource': 'file:/var/cache/kolab-freebusy/%s.ifb',
                     'expires': '15m'
                 },
-            'directory "kolab-users"': {
+            'directory "kolab-people"': {
                     'type': 'ldap',
                     'host': conf.get('ldap', 'ldap_uri'),
                     'base_dn': conf.get('ldap', 'base_dn'),


commit a7c5e671b0531ac2ea390ebc0f1f604218d62718
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 14 13:23:26 2014 +0200

    Use ldap_simple as the default password driver

diff --git a/share/templates/roundcubemail/password.inc.php.tpl b/share/templates/roundcubemail/password.inc.php.tpl
index ca3f815..16895fa 100644
--- a/share/templates/roundcubemail/password.inc.php.tpl
+++ b/share/templates/roundcubemail/password.inc.php.tpl
@@ -4,7 +4,7 @@
     // -----------------------
     // A driver to use for password change. Default: "sql".
     // See README file for list of supported driver names.
-    \$config['password_driver'] = 'ldap';
+    \$config['password_driver'] = 'ldap_simple';
 
     // Determine whether current password is required to change password.
     // Default: false.




More information about the commits mailing list