|
 |
88a20bf |
diff -up dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf
|
|
|
88a20bf |
--- dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf.default-settings 2018-02-28 15:28:57.000000000 +0100
|
|
|
88a20bf |
+++ dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf 2018-03-01 10:29:38.208368555 +0100
|
|
|
88a20bf |
@@ -322,6 +322,7 @@ protocol !indexer-worker {
|
|
|
08701bf |
# them simultaneously.
|
|
|
08701bf |
#mbox_read_locks = fcntl
|
|
|
08701bf |
#mbox_write_locks = dotlock fcntl
|
|
|
08701bf |
+mbox_write_locks = fcntl
|
|
|
08701bf |
|
|
|
08701bf |
# Maximum time to wait for lock (all of them) before aborting.
|
|
|
08701bf |
#mbox_lock_timeout = 5 mins
|
|
|
88a20bf |
diff -up dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf
|
|
|
88a20bf |
--- dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf.default-settings 2018-02-28 15:28:57.000000000 +0100
|
|
|
88a20bf |
+++ dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf 2018-03-01 10:33:54.779499044 +0100
|
|
|
31231a5 |
@@ -3,7 +3,9 @@
|
|
|
31231a5 |
##
|
|
|
31231a5 |
|
|
|
31231a5 |
# SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
|
|
|
31231a5 |
-#ssl = yes
|
|
|
31231a5 |
+# disable plain pop3 and imap, allowed are only pop3+TLS, pop3s, imap+TLS and imaps
|
|
|
31231a5 |
+# plain imap and pop3 are still allowed for local connections
|
|
|
31231a5 |
+ssl = required
|
|
|
31231a5 |
|
|
|
31231a5 |
# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
|
|
|
31231a5 |
# dropping root privileges, so keep the key file unreadable by anyone but
|
|
|
88a20bf |
@@ -57,6 +59,7 @@ ssl_key =
|
|
|
88a20bf |
#ssl_cipher_list = ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH
|
|
|
88a20bf |
# To disable non-EC DH, use:
|
|
|
88a20bf |
#ssl_cipher_list = ALL:!DH:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH
|
|
|
f874d6b |
+ssl_cipher_list = PROFILE=SYSTEM
|
|
|
e8c10d3 |
|
|
|
88a20bf |
# Colon separated list of elliptic curves to use. Empty value (the default)
|
|
|
88a20bf |
# means use the defaults from the SSL library. P-521:P-384:P-256 would be an
|