Merge branch 'add-option-custom-reject-sender-message-release-notes' into 'main'

Add Release Note for rejectSenderMessage and fix typo

See merge request simple-nixos-mailserver/nixos-mailserver!515
This commit is contained in:
Martin Weinelt
2026-04-19 14:27:24 +00:00
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -777,7 +777,7 @@ in
rejectSenderMessage = mkOption { rejectSenderMessage = mkOption {
type = types.str; type = types.str;
default = ""; default = "";
example = "Your e-mail has not been delivered because we have blocked your e-mai address. If you believe that your e-mail address has been blocked by mistake, or if you have any other legitimate concern, please contact <address>."; example = "Your e-mail has not been delivered because we have blocked your e-mail address. If you believe that your e-mail address has been blocked by mistake, or if you have any other legitimate concern, please contact <address>.";
description = '' description = ''
SMTP message returned to rejected senders. If not set the Postfix SMTP message returned to rejected senders. If not set the Postfix
default will be used. default will be used.
+2
View File
@@ -32,6 +32,8 @@ NixOS 26.05
:option:`mailserver.ldap.attributes.username`. :option:`mailserver.ldap.attributes.username`.
- Local and LDAP accounts can now co-exist. For overlapping names and addresses - Local and LDAP accounts can now co-exist. For overlapping names and addresses
the local account will always win. the local account will always win.
- Custom reject messages for blocked senders are now possible by setting
:option:`mailserver.rejectSenderMessage` to e.g. comply with GDPR.
- The following integrations are deprecated and will be removed before the next - The following integrations are deprecated and will be removed before the next
release: release: