summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-07 17:44:35 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-07 17:44:35 +0000
commit8f7b40e18c268f3dfa17315373e587bf1dafacd9 (patch)
tree4d3f4a31846467fbfb2a98ba0d5af6bb696dafb4 /conf
parent10060ab8e6aa44adedbdbb975021c98d5db3bb9d (diff)
downloadpykolab-8f7b40e18c268f3dfa17315373e587bf1dafacd9.tar.gz
Move quota_attribute to the actual auth_mechanism, from the backend technology section
Use 'acls', as in plural, since we also have 'annotations'
Diffstat (limited to 'conf')
-rw-r--r--conf/kolab.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/kolab.conf b/conf/kolab.conf
index 8449e9b..5967860 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -1,10 +1,7 @@
-[postfix]
-leave_this_one_to_me = why_dont_cha
-
[kolab]
primary_domain = example.org
-imap_backend = cyrus-imap
auth_mechanism = ldap
+imap_backend = cyrus-imap
mta = postfix
archving = openbenno
@@ -22,12 +19,15 @@ kolab_domain_filter = (&(associatedDomain=*))
# This is what will be passed to
domain_name_attribute = associateddomain
domain_rootdn_attribute = inetdomainbasedn
+quota_attribute = mailquota
[cyrus-imap]
uri = imaps://localhost:993
admin_login = cyrus-admin
admin_passwd = VerySecret
-quota_attribute = mailquota
+
+[postfix]
+leave_this_one_to_me = why_dont_cha
[cyrus-sasl]
result_attribute = mail
@@ -46,7 +46,7 @@ autocreate = {
'/vendor/kolab/folder-test': "true",
'/vendor/kolab/folder-type': "event.default",
},
- 'acl': {
+ 'acls': {
'manager': 'lrs'
}
}