summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-03-05 18:10:09 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-03-05 18:10:09 (GMT)
commitd63bfe3fd6c8d59b89e3f42cb49c328d0aa3db1b (patch)
tree79d30d44e620d875121f08b12da8789b9af4c319
parent725392d30fff09f2359c77a7996336b9aa84e47d (diff)
downloadkolab-conf-d63bfe3fd6c8d59b89e3f42cb49c328d0aa3db1b.tar.gz
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)
-rw-r--r--conf/kolab.globals.in1
-rw-r--r--conf/templates/imapd.conf.template.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 819674c..466ad5d 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -1,4 +1,5 @@
conn_refresh_period : 60
+cyrus-admin : manager
cyrus-admins : manager
cyrus-autocreatequota : 100000
cyrus-imap : TRUE
diff --git a/conf/templates/imapd.conf.template.in b/conf/templates/imapd.conf.template.in
index 9522c7d..fc8727d 100644
--- a/conf/templates/imapd.conf.template.in
+++ b/conf/templates/imapd.conf.template.in
@@ -19,7 +19,7 @@ configdirectory: @imap_statedir@
partition-default: @imap_spool@
allowusermoves: 0
-admins: @@@cyrus-admins@@@
+admins: @@@cyrus-admins|join( )@@@
sasl_pwcheck_method: saslauthd
sasl_mech_list: plain
sendmail: @sbindir@/sendmail