dmarc-reports: report mail message id with domain

This commit is contained in:
Marcel 2024-08-11 17:20:45 +02:00
parent 905be88429
commit e14ab67b1b
No known key found for this signature in database
GPG Key ID: 446F3B093DF81C6A
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ in
type = types.listOf types.str; type = types.listOf types.str;
example = [ "example.com" ]; example = [ "example.com" ];
default = []; default = [];
description = "The domains that this mail server serves and provides an mailbox."; description = "The domains that this mail server serves and provides a mailbox for.";
}; };
relayDomains = mkOption { relayDomains = mkOption {
@ -49,7 +49,7 @@ in
example = [ "lists.example.com" ]; example = [ "lists.example.com" ];
default = []; default = [];
defaultText = lib.literalExpression "config.mailserver.domains"; defaultText = lib.literalExpression "config.mailserver.domains";
description = "The domains that this mail server relays."; description = "The domains that this mail server relays, in addition to those in {option}`domains`.";
}; };
certificateDomains = mkOption { certificateDomains = mkOption {

View File

@ -73,7 +73,7 @@ in
domain = "${cfg.dmarcReporting.domain}"; domain = "${cfg.dmarcReporting.domain}";
org_name = "${cfg.dmarcReporting.organizationName}"; org_name = "${cfg.dmarcReporting.organizationName}";
from_name = "${cfg.dmarcReporting.fromName}"; from_name = "${cfg.dmarcReporting.fromName}";
msgid_from = "dmarc-rua"; msgid_from = "${cfg.dmarcReporting.domain}";
}''} }''}
''; }; ''; };
}; };