Modifications : etc/sv/dovecot

[lhc/ateliers.git] / etc / dovecot / dovecot.conf.m4

diff --git a/etc/dovecot/dovecot.conf.m4 b/etc/dovecot/dovecot.conf.m4
index 7810588..bbfd517 100644 (file)
--- a/etc/dovecot/dovecot.conf.m4
+++ b/etc/dovecot/dovecot.conf.m4
@@ -20,32 +20,31 @@ local_name imap.cyclocoop.org {
        ssl_cert = </etc/dovecot/cyclocoop.org/imap/x509/crt+crl.self-signed.pem
        ssl_key  = </etc/dovecot/cyclocoop.org/imap/x509/key.pem
  }
+local_name imap.ptitvelo.net {
+       ssl_ca   = </etc/dovecot/ptitvelo.net/imap/x509/crt+crl.self-signed.pem
+       ssl_cert = </etc/dovecot/ptitvelo.net/imap/x509/crt+crl.self-signed.pem
+       ssl_key  = </etc/dovecot/ptitvelo.net/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.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
+       ssl_key  = </etc/dovecot/cyclocoop.org/pop/x509/key.pem
+ }
+local_name pop.ptitvelo.net {
+       ssl_ca   = </etc/dovecot/ptitvelo.net/pop/x509/crt+crl.self-signed.pem
+       ssl_cert = </etc/dovecot/ptitvelo.net/pop/x509/crt+crl.self-signed.pem
+       ssl_key  = </etc/dovecot/ptitvelo.net/pop/x509/key.pem
+ }
 mail_debug = yes
 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
        # NOTE: INDEX et CONTROL sont sur une partition sans quota comme le demande la doc
        # VOIR: http://wiki2.dovecot.org/Quota/FS
-namespace inbox {
-       inbox = yes
-       location = 
-       mailbox Drafts {
-               special_use = \Drafts
-        }
-       mailbox Junk {
-               special_use = \Junk
-        }
-       mailbox Sent {
-               special_use = \Sent
-        }
-       mailbox "Sent Messages" {
-               special_use = \Sent
-        }
-       mailbox Trash {
-               special_use = \Trash
-        }
-       prefix = 
-       separator = +
- }
 namespace {
        #list = children
        list = yes
@@ -55,7 +54,7 @@ namespace {
        subscriptions = yes
        type = shared
  }
-mail_plugins = $mail_plugins acl quota
+mail_plugins = $mail_plugins acl quota virtual
 #mail_privileged_group = mail
 #mail_access_groups = mail
 passdb {
@@ -109,16 +108,27 @@ plugin {
  }
 protocol imap {
        mail_plugins = $mail_plugins antispam imap_acl imap_quota
- }
-service imap-login {
-       inet_listener imap {
-               address = 127.0.0.1
-               port    = 143
-               ssl     = no
-        }
-       inet_listener imaps {
-               port = 993
-               ssl  = yes
+       namespace inbox {
+               inbox = yes
+               location = 
+               list = yes
+               mailbox Drafts {
+                       special_use = \Drafts
+                }
+               mailbox Junk {
+                       special_use = \Junk
+                }
+               mailbox Sent {
+                       special_use = \Sent
+                }
+               mailbox "Sent Messages" {
+                       special_use = \Sent
+                }
+               mailbox Trash {
+                       special_use = \Trash
+                }
+               prefix = 
+               separator = +
         }
  }
 protocol lda {
@@ -127,15 +137,52 @@ protocol lda {
        info_log_path =
        log_path =
        mail_plugins = $mail_plugins sieve
+       namespace inbox {
+               inbox = yes
+               location = 
+               list = yes
+               prefix = 
+               separator = +
+        }
        postmaster_address = postmaster+dovecot+lda@LOCAL_DOMAINNAME
        syslog_facility = mail
  }
 protocol lmtp {
-       postmaster_address = postmaster+dovecot+lmtp@LOCAL_DOMAINNAME
-       mail_plugins = $mail_plugins sieve
        #info_log_path = /tmp/dovecot-lmtp.log
+       mail_plugins = $mail_plugins sieve
+       namespace inbox {
+               inbox = yes
+               location = 
+               list = yes
+               prefix = 
+               separator = +
+        }
+       postmaster_address = postmaster+dovecot+lmtp@LOCAL_DOMAINNAME
  }
 protocol pop3 {
+       namespace all {
+        # NOTE: utilisé par /etc/dovecot/pop3/INBOX/dovecot-virtual
+               hidden = yes
+               list = no
+               location = 
+               prefix = all+
+               separator = +
+        }
+       namespace inbox {
+        # NOTE: virtual namespace for the virtual INBOX. Use a global directory for dovecot-virtual files.
+               inbox = yes
+               hidden = yes
+               list = no
+               location = virtual:/etc/dovecot/pop3:INDEX=/var/lib/dovecot-index/%d/%n/POP3:LAYOUT=fs
+               prefix = pop3+
+               separator = +
+        }
+       pop3_client_workarounds =
+       pop3_fast_size_lookups = yes
+       pop3_lock_session = yes
+       pop3_no_flag_updates = yes
+       pop3_uidl_format = %g
+        # NOTE: use GUIDs to avoid accidental POP3 UIDL changes instead of IMAP UIDs.
  }
 protocol sieve {
        mail_debug = yes
@@ -176,9 +223,26 @@ service imap {
                # You may need to increase this limit if you have huge mailboxes.
        process_limit = 1024
  }
+service imap-login {
+       inet_listener imap {
+               address = 127.0.0.1
+               port    = 143
+               ssl     = no
+        }
+       inet_listener imaps {
+               port = 993
+               ssl  = yes
+        }
+ }
 service pop3 {
        process_limit = 1024
  }
+service pop3-login {
+       inet_listener pop3s {
+               port = 995
+               ssl  = yes
+        }
+ }
 ssl = required
 ssl_ca   = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/crt+crl.self-signed.pem
 ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/imap/x509/crt+crl.self-signed.pem