ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2024-12-29 12:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated virtualAliases

Browse Source
This commit is contained in:
Robin Raymond 2018-02-23 16:48:13 +01:00
parent 0cdd1bd4e1
commit c1c4706519
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
default.nix
View File

@ -152,19 +152,6 @@ in
default = {}; default = {};
}; };
virtualAliases = mkOption {
type = types.attrsOf (types.enum (builtins.attrNames cfg.loginAccounts));
example = {
"info@example.com" = "user1@example.com";
"postmaster@example.com" = "user1@example.com";
"abuse@example.com" = "user1@example.com";
};
description = ''
Alias for extraVirtualAliases. Deprecated.
'';
default = {};
};
vmailUID = mkOption { vmailUID = mkOption {
type = types.int; type = types.int;
default = 5000; default = 5000;
@ -555,12 +542,4 @@ in
./mail-server/nginx.nix ./mail-server/nginx.nix
./mail-server/kresd.nix ./mail-server/kresd.nix
]; ];
config = lib.mkIf config.mailserver.enable {
warnings = if (config.mailserver.virtualAliases != {}) then [ ''
virtualAliases had been derprecated. Use extraVirtualAliases instead or
use the `aliases` field of the loginAccount attribute set
'']
else [];
};
} }

8
mail-server/postfix.nix
View File

@ -37,13 +37,7 @@ let
cfg.loginAccounts); cfg.loginAccounts);
# extra_valiases_postfix :: [ String ] # extra_valiases_postfix :: [ String ]
# TODO: Remove virtualAliases when deprecated -> removed extra_valiases_postfix =
extra_valiases_postfix = (map
(from:
let to = cfg.virtualAliases.${from};
in "${from} ${to}")
(builtins.attrNames cfg.virtualAliases))
++
(map (map
(from: (from:
let to = cfg.extraVirtualAliases.${from}; let to = cfg.extraVirtualAliases.${from};