Merge branch '6123-dovecot-improve-99-ispconfig-custom-config-conf-inclusion' into 'develop'

Marius Burkard · Marius Burkard · commit 9811bb23e2d5 · 2021-03-25T16:22:34.000Z
Resolve "dovecot: improve 99-ispconfig-custom-config.conf inclusion"

Closes #6123

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

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ 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`
`19`	`20`	`passdb {`
`20`	`21`	`args = /etc/dovecot/dovecot-sql.conf`
`21`	`22`	`driver = sql`
`@@ -68,21 +69,21 @@ service imap-login {`
`68`	`69`	`process_limit = 512`
`69`	`70`	`}`
`70`	`71`	`protocol imap {`
`71`		`- mail_plugins = quota imap_quota`
	`72`	`+ mail_plugins = $mail_plugins quota imap_quota`
`72`	`73`	`auth_verbose = yes`
`73`	`74`	`}`
`74`	`75`	`protocol pop3 {`
`75`	`76`	`pop3_uidl_format = %08Xu%08Xv`
`76`		`- mail_plugins = quota`
	`77`	`+ mail_plugins = $mail_plugins quota`
`77`	`78`	`auth_verbose = yes`
`78`	`79`	`}`
`79`	`80`	`protocol lda {`
`80`	`81`	`postmaster_address = webmaster@localhost`
`81`		`- mail_plugins = sieve quota`
	`82`	`+ mail_plugins = $mail_plugins sieve quota`
`82`	`83`	`}`
`83`	`84`	`protocol lmtp {`
`84`	`85`	`postmaster_address = webmaster@localhost`
`85`		`- mail_plugins = quota sieve`
	`86`	`+ mail_plugins = $mail_plugins quota sieve`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`#2.3+ service stats {`
`@@ -134,4 +135,3 @@ namespace inbox {`
`134`	`135`	`special_use = \Trash`
`135`	`136`	`}`
`136`	`137`	`}`
`137`		`-!include_try conf.d/99-ispconfig-custom-config.conf`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ 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`
`16`	`17`	`passdb {`
`17`	`18`	`args = /etc/dovecot-sql.conf`
`18`	`19`	`driver = sql`
`@@ -62,21 +63,21 @@ service imap-login {`
`62`	`63`	`process_limit = 500`
`63`	`64`	`}`
`64`	`65`	`protocol imap {`
`65`		`- mail_plugins = quota imap_quota`
	`66`	`+ mail_plugins = $mail_plugins quota imap_quota`
`66`	`67`	`auth_verbose = yes`
`67`	`68`	`}`
`68`	`69`	`protocol pop3 {`
`69`	`70`	`pop3_uidl_format = %08Xu%08Xv`
`70`		`- mail_plugins = quota`
	`71`	`+ mail_plugins = $mail_plugins quota`
`71`	`72`	`auth_verbose = yes`
`72`	`73`	`}`
`73`	`74`	`protocol lda {`
`74`		`- mail_plugins = sieve quota`
	`75`	`+ mail_plugins = $mail_plugins sieve quota`
`75`	`76`	`postmaster_address = root@localhost`
`76`	`77`	`}`
`77`	`78`	`protocol lmtp {`
`78`	`79`	`postmaster_address = webmaster@localhost`
`79`		`- mail_plugins = quota sieve`
	`80`	`+ mail_plugins = $mail_plugins quota sieve`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`#2.3+ service stats {`
`@@ -128,4 +129,3 @@ namespace inbox {`
`128`	`129`	`special_use = \Trash`
`129`	`130`	`}`
`130`	`131`	`}`
`131`		`-!include_try conf.d/99-ispconfig-custom-config.conf`