Commit bb68be20 authored by Thom's avatar Thom 🛠
Browse files

include_try for general dovecot at the end of the config

parent 6a45dc9e
Pipeline #8271 passed with stage
in 7 minutes and 56 seconds
...@@ -16,7 +16,6 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH ...@@ -16,7 +16,6 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH
ssl_prefer_server_ciphers = no ssl_prefer_server_ciphers = no
mail_max_userip_connections = 100 mail_max_userip_connections = 100
mail_plugins = quota mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb { passdb {
args = /etc/dovecot/dovecot-sql.conf args = /etc/dovecot/dovecot-sql.conf
driver = sql driver = sql
...@@ -135,3 +134,5 @@ namespace inbox { ...@@ -135,3 +134,5 @@ namespace inbox {
special_use = \Trash 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 ...@@ -16,7 +16,6 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH
ssl_prefer_server_ciphers = no ssl_prefer_server_ciphers = no
mail_max_userip_connections = 100 mail_max_userip_connections = 100
mail_plugins = quota mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb { passdb {
args = /etc/dovecot/dovecot-sql.conf args = /etc/dovecot/dovecot-sql.conf
driver = sql driver = sql
...@@ -112,3 +111,5 @@ plugin { ...@@ -112,3 +111,5 @@ plugin {
quota_status_nouser = DUNNO quota_status_nouser = DUNNO
quota_status_overquota = "552 5.2.2 Mailbox is full" 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 ...@@ -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_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 ssl_prefer_server_ciphers = no
mail_plugins = quota mail_plugins = quota
!include_try conf.d/99-ispconfig-custom-config.conf
passdb { passdb {
args = /etc/dovecot-sql.conf args = /etc/dovecot-sql.conf
driver = sql driver = sql
...@@ -129,3 +128,5 @@ namespace inbox { ...@@ -129,3 +128,5 @@ namespace inbox {
special_use = \Trash 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