Merge branch 'upstream' (Lucid->Precise transition)

diff --git a/conf.d/10-auth.conf b/conf.d/10-auth.conf
index d5d2a45ae057f5ca4327af021b1d1e4b26f4748d..d08f3453511da807fe9f608407962b5c7fe866f1 100644 (file)
--- a/conf.d/10-auth.conf
+++ b/conf.d/10-auth.conf
@@ -121,7 +121,7 @@ auth_mechanisms = plain
 !include auth-system.conf.ext
 #!include auth-sql.conf.ext
 #!include auth-ldap.conf.ext
-#!include auth-passwdfile.conf.ext
+!include auth-passwdfile.conf.ext
 #!include auth-checkpassword.conf.ext
 #!include auth-vpopmail.conf.ext
 #!include auth-static.conf.ext

diff --git a/conf.d/10-logging.conf b/conf.d/10-logging.conf
index ac6c82732ade5f53b412c777ccae414e0d35aae4..7633a67217ce40a8a6f2597418ba1f40cb648540 100644 (file)
--- a/conf.d/10-logging.conf
+++ b/conf.d/10-logging.conf
@@ -59,6 +59,7 @@ plugin {
 # Prefix for each line written to log file. % codes are in strftime(3)
 # format.
 #log_timestamp = "%b %d %H:%M:%S "
+log_timestamp = "%Y-%m-%d %H:%M:%S "
 
 # Space-separated list of elements we want to log. The elements which have
 # a non-empty variable value are joined together to form a comma-separated

diff --git a/conf.d/10-mail.conf b/conf.d/10-mail.conf
index 9c05710479a95e9197492ee3c1f97a83d647374a..d32dcd1c3c57c1d3a641fca0ef7d5327a35d6faa 100644 (file)
--- a/conf.d/10-mail.conf
+++ b/conf.d/10-mail.conf
@@ -28,6 +28,7 @@
 # <doc/wiki/MailLocation.txt>
 #
 #mail_location = 
+mail_location = maildir:~/.maildir
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections.
@@ -114,6 +115,9 @@
 # Typically this is set to "mail" to give access to /var/mail.
 #mail_privileged_group =
 
+# TODO: AWD: We used to include this. Do we still need it?
+#mail_privileged_group = mail
+
 # Grant access to these supplementary groups for mail processes. Typically
 # these are used to set up access to shared mailboxes. Note that it may be
 # dangerous to set these if users can create symlinks (e.g. if "mail" group is

diff --git a/conf.d/10-master.conf b/conf.d/10-master.conf
index f0e79abc82289dc2c6957bf281e32ec3bec1d249..019c1fdd7266be235d9f9b2b66271d928e665a57 100644 (file)
--- a/conf.d/10-master.conf
+++ b/conf.d/10-master.conf
@@ -85,9 +85,11 @@ service auth {
   }
 
   # Postfix smtp-auth
-  #unix_listener /var/spool/postfix/private/auth {
-  #  mode = 0666
-  #}
+  unix_listener /var/spool/postfix/private/auth {
+    mode = 0660
+    user = postfix
+    group = postfix
+  }
 
   # Auth process is run as this user.
   #user = $default_internal_user

diff --git a/conf.d/10-ssl.conf b/conf.d/10-ssl.conf
index d8af7958e3dc23a68ebc733fa1930f4d07cfd1d3..4cff43300757dea6c3baa74d7b4b3a0a1ee0d6ba 100644 (file)
--- a/conf.d/10-ssl.conf
+++ b/conf.d/10-ssl.conf
@@ -9,8 +9,8 @@
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-ssl_cert = </etc/ssl/certs/dovecot.pem
-ssl_key = </etc/ssl/private/dovecot.pem
+ssl_cert = </etc/ssl/certs/olinda.dovecot.crt
+ssl_key = </etc/ssl/private/olinda.dovecot.key
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter. Since this file is often

diff --git a/conf.d/15-lda.conf b/conf.d/15-lda.conf
index 609023a202155c3bf38cb589a97e727342b3cd44..42318a8cfa64cdc1a62b689a135742410af6cfc4 100644 (file)
--- a/conf.d/15-lda.conf
+++ b/conf.d/15-lda.conf
@@ -45,4 +45,18 @@
 protocol lda {
   # Space separated list of plugins to load (default is global mail_plugins).
   #mail_plugins = $mail_plugins
+  mail_plugins = sieve
+
+  # Format to use for logging mail deliveries. You can use variables:
+  #  %$ - Delivery status message (e.g. "saved to INBOX")
+  #  %m - Message-ID
+  #  %s - Subject
+  #  %f - From address
+  #deliver_log_format = msgid=%m: %$
+  deliver_log_format = msgid=%m, subj=%s: %$
+  log_path = /var/log/mail/dovecot-deliver.log
+  info_log_path = /var/log/mail/dovecot-deliver.info.log
+
+  # UNIX socket path to master authentication server to find users.
+  auth_socket_path = /var/run/dovecot/auth-userdb
 }

diff --git a/conf.d/auth-passwdfile.conf.ext b/conf.d/auth-passwdfile.conf.ext
index 3f57ceebdfa2e32ab299a6b2e95b9aec6a184b94..81ab213d792e07283fd79ed089d78b9eb7f825a6 100644 (file)
--- a/conf.d/auth-passwdfile.conf.ext
+++ b/conf.d/auth-passwdfile.conf.ext
@@ -5,10 +5,15 @@
 
 passdb {
   driver = passwd-file
-  args = scheme=CRYPT username_format=%u /etc/dovecot/users
+  args = /etc/dovecot/extra-users.passwd
 }
 
-userdb {
-  driver = passwd-file
-  args = username_format=%u /etc/dovecot/users
-}
+#passdb {
+#  driver = passwd-file
+#  args = scheme=CRYPT username_format=%u /etc/dovecot/users
+#}
+
+#userdb {
+#  driver = passwd-file
+#  args = username_format=%u /etc/dovecot/users
+#}