diff -r 3f80fa12b972 -r 09548e292fb1 dovecot/dovecot.conf
--- a/dovecot/dovecot.conf	Wed Feb 08 20:16:40 2012 +0200
+++ b/dovecot/dovecot.conf	Wed Feb 08 20:16:25 2012 +0200
@@ -2,72 +2,103 @@
 ##  dovecot.conf -- Dovecot server configuration
 ##
 
-protocols                  = imap
+protocols                  = imap pop3 sieve
 
-protocol imap {
-    listen                 = 127.0.0.1:143
-    ssl_listen             = 127.0.0.1:993
-    log_path               = @l_prefix@/var/dovecot/log/imap-error.log
-    info_log_path          = @l_prefix@/var/dovecot/log/imap-info.log
-    login_executable       = @l_prefix@/libexec/dovecot/imap-login
-    mail_executable        = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap
+service imap-login {
+    protocol               = imap
+    inet_listener imap {
+        address            = 127.0.0.1
+        port               = 143
+    }
+    inet_listener imaps {
+        address            = 127.0.0.1
+        port               = 993
+    }
+    client_limit           = 256
+    process_limit          = 128
+    process_min_avail      = 4
+    user                   = @l_musr@
+}
+
+service pop3-login {
+    protocol               = pop3
+    inet_listener pop3 {
+        address            = 127.0.0.1
+        port               = 110
+    }
+    inet_listener pop3s {
+        address            = 127.0.0.1
+        port               = 995
+    }
+    client_limit           = 256
+    process_limit          = 128
+    process_min_avail      = 4
+    user                   = @l_musr@
+}
+
+service managesieve-login {
+    protocol               = sieve
+    inet_listener sieve {
+        address            = 127.0.0.1
+        port               = 4190
+    }
+    client_limit           = 256
+    process_limit          = 128
+    process_min_avail      = 4
+    user                   = @l_musr@
+}
+
+service auth {
+    unix_listener auth-master {
+        mode               = 0660
+    }
+    unix_listener auth-client {
+        mode               = 0660
+    }
+    unix_listener auth-userdb {
+        mode               = 0660
+    }
 }
 
 ssl                        = yes
-ssl_cert_file              = @l_prefix@/etc/x509/example-server.crt.pem
-ssl_key_file               = @l_prefix@/etc/x509/example-server.key.pem
+ssl_ca                     = <@l_prefix@/etc/x509/example-ca.crt.pem
+ssl_cert                   = <@l_prefix@/etc/x509/example-server.crt.pem
+ssl_key                    = <@l_prefix@/etc/x509/example-server.key.pem
 
-log_path                   = @l_prefix@/var/dovecot/log/dovecot-error.log
-info_log_path              = @l_prefix@/var/dovecot/log/dovecot-info.log
-log_timestamp              = '%b %d %H:%M:%S '
-
-login_user                 = @l_nusr@
-login_processes_count      = 4
-login_max_processes_count  = 128
-login_max_connections      = 256
-
-mail_location              = mbox:~/.mail:INBOX=~/.mail/inbox
+mail_location              = mbox:~/.mail:INBOX=~/.mail/inbox:INDEX=~/.mail
 mail_uid                   = @l_rusr@
 mail_gid                   = @l_rusr@
 mail_privileged_group      = @l_rusr@
 mbox_read_locks            = fcntl
 mbox_write_locks           = fcntl
 
+plugin {
+    sieve_dir              = ~/.mail/.sieve
+    sieve                  = ~/.mail/.sieve.active
+}
+
 auth_realms                = example.com
-auth_default_realm         =
 auth_verbose               = yes
 disable_plaintext_auth     = no
 
+auth_mechanisms            = plain login
 auth_debug                 = no
 auth_debug_passwords       = no
 mail_debug                 = no
 verbose_ssl                = no
 
+default_login_user         = @l_musr@
+default_internal_user      = @l_rusr@
+
 protocol lda {
     postmaster_address     = postmaster
-    log_path               = @l_prefix@/var/dovecot/log/deliver-error.log
-    info_log_path          = @l_prefix@/var/dovecot/log/deliver-info.log
 }
 
-auth default {
-    mechanisms             = plain login
-    passdb passwd {
-    }
-    userdb passwd {
-    }
-    socket listen {
-        master {
-            path           = @l_prefix@/var/dovecot/run/auth-master
-            mode           = 0600
-            user           = @l_rusr@
-            group          = @l_rugrp@
-        }
-        client {
-            path           = @l_prefix@/var/dovecot/run/auth-client
-            mode           = 0660
-            user           = @l_musr@
-            group          = @l_mgrp@
-        }
-    }
+passdb {
+    driver                 = passwd
 }
 
+userdb {
+    driver                 = passwd
+}
+