Merge branch 'master' into admin-login

# Conflicts:
#	data/web/js/site/mailbox.js
This commit is contained in:
Marcel Hofer
2019-03-23 21:17:02 +01:00
12 changed files with 63 additions and 31 deletions

View File

@@ -384,10 +384,10 @@ service stats {
}
}
imap_max_line_length = 2 M
auth_cache_verify_password_with_worker = yes
auth_cache_negative_ttl = 0
auth_cache_ttl = 30 s
auth_cache_size = 2 M
#auth_cache_verify_password_with_worker = yes
#auth_cache_negative_ttl = 0
#auth_cache_ttl = 30 s
#auth_cache_size = 2 M
!include_try /usr/local/etc/dovecot/extra.conf
!include_try /usr/local/etc/dovecot/sogo-sso.conf
default_client_limit = 10400