X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fdovecot%2Fdovecot.conf.m4;h=48bd71dca967debd698f411423983e8c96a1754f;hb=0770f3ddd19fda7d51657e76f18f0ad2fafcd643;hp=4ecaf2aac68fcc9d8067d8d89b123501906cb607;hpb=aaa93944cde725b38de14b7a6fa3be63993d2e9a;p=lhc%2Fateliers.git

diff --git a/etc/dovecot/dovecot.conf.m4 b/etc/dovecot/dovecot.conf.m4
index 4ecaf2a..48bd71d 100644
--- a/etc/dovecot/dovecot.conf.m4
+++ b/etc/dovecot/dovecot.conf.m4
@@ -15,6 +15,11 @@ local_name imap.LOCAL_DOMAINNAME {
 	ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/crt+crl.self-signed.pem
 	ssl_key  = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/key.pem
  }
+local_name imap.chatperche.org {
+	ssl_ca   = </etc/dovecot/chatperche.org/imap/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/chatperche.org/imap/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/chatperche.org/imap/x509/key.pem
+ }
 local_name imap.cyclocoop.org {
 	ssl_ca   = </etc/dovecot/cyclocoop.org/imap/x509/crt+crl.self-signed.pem
 	ssl_cert = </etc/dovecot/cyclocoop.org/imap/x509/crt+crl.self-signed.pem
@@ -35,11 +40,21 @@ local_name imap.veli-velo.org {
 	ssl_cert = </etc/dovecot/veli-velo.org/imap/x509/crt+crl.self-signed.pem
 	ssl_key  = </etc/dovecot/veli-velo.org/imap/x509/key.pem
  }
+local_name imap.wiklou.org {
+	ssl_ca   = </etc/dovecot/wiklou.org/imap/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/wiklou.org/imap/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/wiklou.org/imap/x509/key.pem
+ }
 local_name pop.LOCAL_DOMAINNAME {
 	ssl_ca   = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
 	ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
 	ssl_key  = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/key.pem
  }
+local_name pop.chatperche.org {
+	ssl_ca   = </etc/dovecot/chatperche.org/pop/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/chatperche.org/pop/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/chatperche.org/pop/x509/key.pem
+ }
 local_name pop.cyclocoop.org {
 	ssl_ca   = </etc/dovecot/cyclocoop.org/pop/x509/crt+crl.self-signed.pem
 	ssl_cert = </etc/dovecot/cyclocoop.org/pop/x509/crt+crl.self-signed.pem
@@ -60,6 +75,11 @@ local_name pop.veli-velo.org {
 	ssl_cert = </etc/dovecot/veli-velo.org/pop/x509/crt+crl.self-signed.pem
 	ssl_key  = </etc/dovecot/veli-velo.org/pop/x509/key.pem
  }
+local_name pop.wiklou.org {
+	ssl_ca   = </etc/dovecot/wiklou.org/pop/x509/crt+crl.self-signed.pem
+	ssl_cert = </etc/dovecot/wiklou.org/pop/x509/crt+crl.self-signed.pem
+	ssl_key  = </etc/dovecot/wiklou.org/pop/x509/key.pem
+ }
 mail_debug = no
 mail_home = /home/mail/data/%d/%n
 mail_location = maildir:/home/mail/data/%d/%n/Maildir:INDEX=/var/lib/dovecot-index/%d/%n:CONTROL=/var/lib/dovecot-control/%d/%n
@@ -126,6 +146,7 @@ plugin {
 	sieve_dir        = /home/mail/data/%d/%n/sieve.d/
 	#sieve_extensions = +spamtest +spamtestplus
 	sieve_global_dir = /etc/dovecot/sieve/global.d/
+	sieve_max_redirects = 10
 	sieve_max_script_size = 1M
 	sieve_quota_max_scripts = 0
 	sieve_quota_max_storage = 10M
@@ -207,7 +228,7 @@ protocol pop3 {
 	 }
 	pop3_client_workarounds =
 	pop3_fast_size_lookups = yes
-	pop3_lock_session = yes
+	pop3_lock_session = no
 	pop3_no_flag_updates = yes
 	pop3_uidl_format = %g
 	 # NOTE: use GUIDs to avoid accidental POP3 UIDL changes instead of IMAP UIDs.