Commit 9811bb23 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6123-dovecot-improve-99-ispconfig-custom-config-conf-inclusion' into 'develop'

Resolve "dovecot: improve 99-ispconfig-custom-config.conf inclusion"

Closes #6123

See merge request ispconfig/ispconfig3!1459
parents cce67c75 a8495442
......@@ -16,6 +16,7 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH
ssl_prefer_server_ciphers = no
mail_max_userip_connections = 100
mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
......@@ -68,21 +69,21 @@ service imap-login {
process_limit = 512
}
protocol imap {
mail_plugins = quota imap_quota
mail_plugins = $mail_plugins quota imap_quota
auth_verbose = yes
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
mail_plugins = $mail_plugins quota
auth_verbose = yes
}
protocol lda {
postmaster_address = webmaster@localhost
mail_plugins = sieve quota
mail_plugins = $mail_plugins sieve quota
}
protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
mail_plugins = $mail_plugins quota sieve
}
#2.3+ service stats {
......@@ -134,4 +135,3 @@ namespace inbox {
special_use = \Trash
}
}
!include_try conf.d/99-ispconfig-custom-config.conf
......@@ -16,6 +16,7 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH
ssl_prefer_server_ciphers = no
mail_max_userip_connections = 100
mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb {
args = /etc/dovecot/dovecot-sql.conf
driver = sql
......@@ -65,21 +66,21 @@ service imap-login {
process_limit = 512
}
protocol imap {
mail_plugins = quota imap_quota
mail_plugins = $mail_plugins quota imap_quota
auth_verbose = yes
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
mail_plugins = $mail_plugins quota
auth_verbose = yes
}
protocol lda {
postmaster_address = webmaster@localhost
mail_plugins = sieve quota
mail_plugins = $mail_plugins sieve quota
}
protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
mail_plugins = $mail_plugins quota sieve
}
......@@ -111,4 +112,3 @@ plugin {
quota_status_nouser = DUNNO
quota_status_overquota = "552 5.2.2 Mailbox is full"
}
!include_try conf.d/99-ispconfig-custom-config.conf
......@@ -13,6 +13,7 @@ ssl_min_protocol = TLSv1.2
ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
ssl_prefer_server_ciphers = no
mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb {
args = /etc/dovecot-sql.conf
driver = sql
......@@ -62,21 +63,21 @@ service imap-login {
process_limit = 500
}
protocol imap {
mail_plugins = quota imap_quota
mail_plugins = $mail_plugins quota imap_quota
auth_verbose = yes
}
protocol pop3 {
pop3_uidl_format = %08Xu%08Xv
mail_plugins = quota
mail_plugins = $mail_plugins quota
auth_verbose = yes
}
protocol lda {
mail_plugins = sieve quota
mail_plugins = $mail_plugins sieve quota
postmaster_address = root@localhost
}
protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
mail_plugins = $mail_plugins quota sieve
}
#2.3+ service stats {
......@@ -128,4 +129,3 @@ namespace inbox {
special_use = \Trash
}
}
!include_try conf.d/99-ispconfig-custom-config.conf
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment