Merge pull request #281915 from exi/patch-1

Dovecot: Do not include empty sieve_extensions and sieve_global_extensions
This commit is contained in:
Kevin Cox 2024-01-20 09:10:41 -05:00 committed by GitHub
commit 9cd3bd7a5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -119,9 +119,10 @@ let
''
plugin {
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 != []) ''
${
concatStringsSep "\n" (flatten (imap1 (