Commit f9c22b42 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6126-include_try-for-custom-config-should-be-on-end-of-dovecot-config' into 'develop'

Resolve "include_try for custom config should be on end of dovecot config"

See merge request ispconfig/ispconfig3!1466
parents 6a45dc9e bb68be20
Pipeline #8331 passed with stage
in 11 seconds
......@@ -16,7 +16,6 @@ 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
......@@ -135,3 +134,5 @@ namespace inbox {
special_use = \Trash
}
}
!include_try conf.d/99-ispconfig-custom-config.conf
\ No newline at end of file
......@@ -16,7 +16,6 @@ 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
......@@ -112,3 +111,5 @@ plugin {
quota_status_nouser = DUNNO
quota_status_overquota = "552 5.2.2 Mailbox is full"
}
!include_try conf.d/99-ispconfig-custom-config.conf
\ No newline at end of file
......@@ -13,7 +13,6 @@ 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
......@@ -129,3 +128,5 @@ 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