From 41219cc690e69d5dbdb028e755fdca95c837e23a Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 25 Apr 2020 23:33:01 +0200 Subject: [PATCH] Rename rejectMessage to sendOnlyRejectMessage --- default.nix | 7 ++++--- mail-server/postfix.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 7e2eb6c..499e0aa 100644 --- a/default.nix +++ b/default.nix @@ -143,12 +143,13 @@ in default = false; description = '' Specifies if the account should be a send-only account. - Emails sent to send-only accounts will be rejected with the - rejectMessage stating the reason. + Emails sent to send-only accounts will be rejected from + unauthorized senders with the sendOnlyRejectMessage + stating the reason. ''; }; - rejectMessage = mkOption { + sendOnlyRejectMessage = mkOption { type = types.str; default = "This account cannot receive emails."; description = '' diff --git a/mail-server/postfix.nix b/mail-server/postfix.nix index 00c62c5..dff0d60 100644 --- a/mail-server/postfix.nix +++ b/mail-server/postfix.nix @@ -52,7 +52,7 @@ let # denied_recipients_postfix :: [ String ] 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))); denied_recipients_file = builtins.toFile "denied_recipients" (lib.concatStringsSep "\n" denied_recipients_postfix);