From bb68be204db7a5708325f7e1a25e5216067e8899 Mon Sep 17 00:00:00 2001 From: Thom Date: Wed, 31 Mar 2021 21:22:09 +0000 Subject: [PATCH] include_try for general dovecot at the end of the config --- install/tpl/debian6_dovecot2.conf.master | 3 ++- install/tpl/debian_dovecot2.conf.master | 3 ++- install/tpl/fedora_dovecot2.conf.master | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master index 7c3e31879d..36ae86fa6d 100644 --- a/install/tpl/debian6_dovecot2.conf.master +++ b/install/tpl/debian6_dovecot2.conf.master @@ -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 diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master index 067f5676e2..12288e2cde 100644 --- a/install/tpl/debian_dovecot2.conf.master +++ b/install/tpl/debian_dovecot2.conf.master @@ -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 diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master index c518fbad74..d4cd148ef0 100644 --- a/install/tpl/fedora_dovecot2.conf.master +++ b/install/tpl/fedora_dovecot2.conf.master @@ -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 -- GitLab