Skip to content

Commit 239f0a3

Browse files
committed
nixos/dovecot: only set sieve options when non-empty
1 parent 5c916f7 commit 239f0a3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

nixos/modules/services/mail/dovecot.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -789,12 +789,12 @@ in
789789

790790
pluginSettings = lib.mapAttrs (n: lib.mkDefault) (
791791
if versionAtLeast cfg.package.version "2.4" then
792-
{
793-
sieve_plugins = concatStringsSep " " cfg.sieve.plugins;
794-
sieve_extensions = concatStringsSep " " cfg.sieve.extensions;
795-
sieve_global_extensions = concatStringsSep " " cfg.sieve.globalExtensions;
796-
sieve_pipe_bin_dir = sievePipeBinScriptDirectory;
797-
}
792+
(lib.concatMapAttrs (n: v: optionalAttrs (v != [ ]) { ${n} = concatStringsSep " " v; }) {
793+
sieve_plugins = cfg.sieve.plugins;
794+
sieve_extensions = cfg.sieve.extensions;
795+
sieve_global_extensions = cfg.sieve.globalExtensions;
796+
})
797+
// (optionalAttrs (cfg.sieve.pipeBins != [ ]) { sieve_pipe_bin_dir = sievePipeBinScriptDirectory; })
798798
// sieveScriptSettings
799799
// imapSieveMailboxSettings
800800
else

0 commit comments

Comments
 (0)