pykolab/setup

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Aug 14 11:19:11 CEST 2014


 pykolab/setup/setup_freebusy.py |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 6e91426d541921efd39c7cc12a8372848c312ed4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 14 11:17:30 2014 +0200

    Reflect the appropriate defaults for the Kolab Free/Busy web service

diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 9496651..ff15293 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -79,16 +79,25 @@ def execute(*args, **kw):
         scheme = 'imaps'
 
     resources_imap_uri = '%s://%s:%s@%s:%s/%%kolabtargetfolder?acl=lrs' % (scheme, admin_login, admin_password, hostname, port)
-    users_imap_uri = '%s://%%mail:%s@%s:%s/?proxy_auth=%s' % (scheme, admin_password, hostname, port, admin_login)
+    users_imap_uri = '%s://%%s:%s@%s:%s/?proxy_auth=%s' % (scheme, admin_password, hostname, port, admin_login)
 
     freebusy_settings = {
+            'directory "local"': {
+                    'type': 'static',
+                    'fbsource': 'file:/var/lib/kolab-freebusy/%s.ifb',
+                },
+            'directory "local-cache"': {
+                    'type': 'static',
+                    'fbsource': 'file:/var/cache/kolab-freebusy/%s.ifb',
+                    'expires': '15m'
+                },
             'directory "kolab-users"': {
                     'type': 'ldap',
                     'host': conf.get('ldap', 'ldap_uri'),
                     'base_dn': conf.get('ldap', 'base_dn'),
                     'bind_dn': conf.get('ldap', 'service_bind_dn'),
                     'bind_pw': conf.get('ldap', 'service_bind_pw'),
-                    'filter': '(&(objectClass=kolabInetOrgPerson)(|(uid=%s)(mail=%s)(alias=%s)))',
+                    'filter': '(&(objectClass=kolabInetOrgPerson)(|(mail=%s)(alias=%s)))',
                     'attributes': 'mail',
                     'lc_attributes': 'mail',
                     'fbsource': users_imap_uri,
@@ -103,11 +112,11 @@ def execute(*args, **kw):
                     'bind_dn': conf.get('ldap', 'service_bind_dn'),
                     'bind_pw': conf.get('ldap', 'service_bind_pw'),
                     'attributes': 'mail, kolabtargetfolder',
-                    'filter': '(&(objectClass=kolabsharedfolder)(mail=%s))',
+                    'filter': '(&(objectClass=kolabsharedfolder)(kolabfoldertype=event)(mail=%s))',
                     'fbsource': resources_imap_uri,
                     'cacheto': '/var/cache/kolab-freebusy/%mail.ifb',
                     'expires': '15m',
-                    'loglevel': 300
+                    'loglevel': 300,
                 },
         }
 




More information about the commits mailing list