ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2024-09-22 11:22:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove non longer supported configurations (<21.05)

Browse Source
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

37
default.nix
View File

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

14
mail-server/clamav.nix
View File

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