Merge pull request #281915 from exi/patch-1
Dovecot: Do not include empty sieve_extensions and sieve_global_extensions
This commit is contained in:
commit
9cd3bd7a5c
@ -119,9 +119,10 @@ let
|
|||||||
''
|
''
|
||||||
plugin {
|
plugin {
|
||||||
sieve_plugins = ${concatStringsSep " " cfg.sieve.plugins}
|
sieve_plugins = ${concatStringsSep " " cfg.sieve.plugins}
|
||||||
sieve_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.extensions)}
|
|
||||||
sieve_global_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.globalExtensions)}
|
|
||||||
''
|
''
|
||||||
|
(optionalString (cfg.sieve.extensions != []) ''sieve_extensions = ${concatMapStringsSep " " (el: "+${el}") cfg.sieve.extensions}'')
|
||||||
|
(optionalString (cfg.sieve.globalExtensions != []) ''sieve_global_extensions = ${concatMapStringsSep " " (el: "+${el}") cfg.sieve.globalExtensions}'')
|
||||||
|
|
||||||
(optionalString (cfg.imapsieve.mailbox != []) ''
|
(optionalString (cfg.imapsieve.mailbox != []) ''
|
||||||
${
|
${
|
||||||
concatStringsSep "\n" (flatten (imap1 (
|
concatStringsSep "\n" (flatten (imap1 (
|
||||||
|
Loading…
Reference in New Issue
Block a user