From a849544259034788204ef2f22131bb8f94c84a28 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 24 Mar 2021 11:18:59 -0600
Subject: [PATCH] dovecot: include custom config earlier

---
 install/tpl/debian6_dovecot2.conf.master | 10 +++++-----
 install/tpl/debian_dovecot2.conf.master  | 10 +++++-----
 install/tpl/fedora_dovecot2.conf.master  | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
index 91d745bc39..7c83812dd6 100644
--- a/install/tpl/debian6_dovecot2.conf.master
+++ b/install/tpl/debian6_dovecot2.conf.master
@@ -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
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
index acbb5ccdff..067f5676e2 100644
--- a/install/tpl/debian_dovecot2.conf.master
+++ b/install/tpl/debian_dovecot2.conf.master
@@ -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
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
index 0b31c23b4e..c518fbad74 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -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
-- 
GitLab