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

Rename rejectMessage to sendOnlyRejectMessage

This commit is contained in:
Antoine Eiche 2020-04-25 23:33:01 +02:00
parent d47e4ead88
commit 41219cc690
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default.nix
View File

@ -143,12 +143,13 @@ in
default = false; default = false;
description = '' description = ''
Specifies if the account should be a send-only account. Specifies if the account should be a send-only account.
Emails sent to send-only accounts will be rejected with the Emails sent to send-only accounts will be rejected from
rejectMessage stating the reason. unauthorized senders with the sendOnlyRejectMessage
stating the reason.
''; '';
}; };
rejectMessage = mkOption { sendOnlyRejectMessage = mkOption {
type = types.str; type = types.str;
default = "This account cannot receive emails."; default = "This account cannot receive emails.";
description = '' description = ''

2
mail-server/postfix.nix
View File

@ -52,7 +52,7 @@ let
# denied_recipients_postfix :: [ String ] # denied_recipients_postfix :: [ String ]
denied_recipients_postfix = (map denied_recipients_postfix = (map
(acct: "${acct.name} REJECT ${acct.rejectMessage}") (acct: "${acct.name} REJECT ${acct.sendOnlyRejectMessage}")
(lib.filter (acct: acct.sendOnly) (lib.attrValues cfg.loginAccounts))); (lib.filter (acct: acct.sendOnly) (lib.attrValues cfg.loginAccounts)));
denied_recipients_file = builtins.toFile "denied_recipients" (lib.concatStringsSep "\n" denied_recipients_postfix); denied_recipients_file = builtins.toFile "denied_recipients" (lib.concatStringsSep "\n" denied_recipients_postfix);