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

Marius Burkard · Marius Burkard · commit f9c22b427d4d · 2021-04-01T06:39:07.000Z
Resolve "include_try for custom config should be on end of dovecot config"

See merge request ispconfig/ispconfig3!1466
diff --git 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
diff --git 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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ ssl_cipher_list = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDH`
`16`	`16`	`ssl_prefer_server_ciphers = no`
`17`	`17`	`mail_max_userip_connections = 100`
`18`	`18`	`mail_plugins = quota`
`19`		`-!include_try conf.d/99-ispconfig-custom-config.conf`
`20`	`19`	`passdb {`
`21`	`20`	`args = /etc/dovecot/dovecot-sql.conf`
`22`	`21`	`driver = sql`
`@@ -135,3 +134,5 @@ namespace inbox {`
`135`	`134`	`special_use = \Trash`
`136`	`135`	`}`
`137`	`136`	`}`
	`137`	`+`
	`138`	`+!include_try conf.d/99-ispconfig-custom-config.conf`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ ssl_min_protocol = TLSv1.2`
`13`	`13`	`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`
`14`	`14`	`ssl_prefer_server_ciphers = no`
`15`	`15`	`mail_plugins = quota`
`16`		`-!include_try conf.d/99-ispconfig-custom-config.conf`
`17`	`16`	`passdb {`
`18`	`17`	`args = /etc/dovecot-sql.conf`
`19`	`18`	`driver = sql`
`@@ -129,3 +128,5 @@ namespace inbox {`
`129`	`128`	`special_use = \Trash`
`130`	`129`	`}`
`131`	`130`	`}`
	`131`	`+`
	`132`	`+!include_try conf.d/99-ispconfig-custom-config.conf`