Branch 'dev/boddie-new/combined' - pykolab/setup
Paul Boddie
boddie at kolabsys.com
Fri Sep 12 21:43:45 CEST 2014
pykolab/setup/setup_freebusy.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 21da13431fa9f8c04f1acdc293c65ef4f2c2335e
Author: Paul Boddie <paul at boddie.org.uk>
Date: Fri Sep 12 20:58:03 2014 +0200
Fixed syntax errors caused during merging.
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 05309a3..69e1781 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -96,16 +96,16 @@ def execute(*args, **kw):
users_imap_uri = '%s://%%s:%s@%s:%s/?proxy_auth=%s' % (scheme, admin_password, hostname, port, admin_login)
freebusy_settings = [
- ('directory "local"': {
+ ('directory "local"', {
'type': 'static',
'fbsource': 'file:/var/lib/kolab-freebusy/%s.ifb',
}),
- ('directory "local-cache"': {
+ ('directory "local-cache"', {
'type': 'static',
'fbsource': 'file:/var/cache/kolab-freebusy/%s.ifb',
'expires': '15m'
}),
- ('directory "kolab-people"': {
+ ('directory "kolab-people"', {
'type': 'ldap',
'host': conf.get('ldap', 'ldap_uri'),
'base_dn': conf.get('ldap', 'base_dn'),
More information about the commits
mailing list