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

put the warning where it actually works ^^

This commit is contained in:
Robin Raymond 2017-11-21 12:04:10 +01:00
parent de73b65b7d
commit bc1a1b8993
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
default.nix
View File

@ -117,7 +117,6 @@ in
extraVirtualAliases = mkOption { extraVirtualAliases = mkOption {
type = types.attrsOf (types.enum (builtins.attrNames cfg.loginAccounts)); type = types.attrsOf (types.enum (builtins.attrNames cfg.loginAccounts));
warnings = [ "virtualAliases had been derprecated. Use extraVirtualAliases instead or use the `aliases` field of the loginAccount attribute set"];
example = { example = {
"info@example.com" = "user1@example.com"; "info@example.com" = "user1@example.com";
"postmaster@example.com" = "user1@example.com"; "postmaster@example.com" = "user1@example.com";
@ -136,7 +135,6 @@ in
virtualAliases = mkOption { virtualAliases = mkOption {
type = types.attrsOf (types.enum (builtins.attrNames cfg.loginAccounts)); type = types.attrsOf (types.enum (builtins.attrNames cfg.loginAccounts));
warnings = [ "virtualAliases had been derprecated. Use extraVirtualAliases instead or use the `aliases` field of the loginAccount attribute set"];
example = { example = {
"info@example.com" = "user1@example.com"; "info@example.com" = "user1@example.com";
"postmaster@example.com" = "user1@example.com"; "postmaster@example.com" = "user1@example.com";
@ -327,4 +325,12 @@ in
./mail-server/rmilter.nix ./mail-server/rmilter.nix
./mail-server/nginx.nix ./mail-server/nginx.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 [];
};
} }