christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove non longer supported configurations (<21.05)

This commit is contained in:
Antoine Eiche 2021-07-23 23:21:36 +02:00
parent 864ea5bfef
commit 9578dbac69
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -421,8 +421,7 @@ in
The mailboxes for dovecot. The mailboxes for dovecot.
Depending on the mail client used it might be necessary to change some mailbox's name. Depending on the mail client used it might be necessary to change some mailbox's name.
''; '';
default = let default = {
defMailBoxes = {
Trash = { Trash = {
auto = "no"; auto = "no";
specialUse = "Trash"; specialUse = "Trash";
@ -440,8 +439,6 @@ in
specialUse = "Sent"; specialUse = "Sent";
}; };
}; };
in if (versionAtLeast version "20.09pre") then defMailBoxes
else (flip mapAttrsToList defMailBoxes (name: options: { inherit name; } // options));
}; };
certificateScheme = mkOption { certificateScheme = mkOption {

14
mail-server/clamav.nix
View File

@ -18,25 +18,13 @@
let let
cfg = config.mailserver; cfg = config.mailserver;
clamHasSettings = options.services.clamav.daemon ? settings;
in in
with lib;
{ {
config = lib.mkIf (cfg.enable && cfg.virusScanning) { config = lib.mkIf (cfg.enable && cfg.virusScanning) {
# Remove extraConfig and settings conditional after 20.09 support is removed
services.clamav.daemon = { services.clamav.daemon = {
enable = true; enable = true;
} // (if clamHasSettings then {
settings.PhishingScanURLs = "no"; settings.PhishingScanURLs = "no";
} else { };
extraConfig = ''
PhishingScanURLs no
'';
});
services.clamav.updater.enable = true; services.clamav.updater.enable = true;
}; };
} }