From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 install/tpl/debian_dovecot2.conf.master |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
index 5b04c61..80ca21d 100644
--- a/install/tpl/debian_dovecot2.conf.master
+++ b/install/tpl/debian_dovecot2.conf.master
@@ -1,14 +1,20 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
 mail_privileged_group = vmail
+postmaster_address = postmaster@example.com
 ssl_cert = </etc/postfix/smtpd.cert
 ssl_key = </etc/postfix/smtpd.key
+ssl_protocols = !SSLv2 !SSLv3
+mail_max_userip_connections = 100
 passdb {
   args = /etc/dovecot/dovecot-sql.conf
   driver = sql
+}
+userdb {
+  driver = prefetch
 }
 userdb {
   args = /etc/dovecot/dovecot-sql.conf
@@ -17,6 +23,7 @@
 plugin {
   quota = dict:user::file:/var/vmail/%d/%n/.quotausage
   sieve=/var/vmail/%d/%n/.sieve
+  sieve_max_redirects = 25
 }
 service auth {
   unix_listener /var/spool/postfix/private/auth {
@@ -40,7 +47,7 @@
 }
 service imap-login {
   client_limit = 1000
-  process_limit = 500
+  process_limit = 512
 }
 protocol imap {
   mail_plugins = quota imap_quota
@@ -55,4 +62,5 @@
 protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
-}
\ No newline at end of file
+}
+mail_plugins = $mail_plugins quota

--
Gitblit v1.9.1