summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-08-14 11:17:30 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-10-30 14:59:35 +0100
commitcab734cbbe904f6a4f6989a7da29715640ac239a (patch)
treeeb29979172e0efaf7c6867167f187c05d08dc13d
parentf3fc5159c3d83fa497e37ce2487c5d11b46058bb (diff)
downloadpykolab-cab734cbbe904f6a4f6989a7da29715640ac239a.tar.gz
Reflect the appropriate defaults for the Kolab Free/Busy web service
-rw-r--r--pykolab/setup/setup_freebusy.py17
1 files changed, 13 insertions, 4 deletions
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,
},
}