From e14ab67b1b594ad28b70fef2ddc29defbbbf22fb Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sun, 11 Aug 2024 17:20:45 +0200
Subject: [PATCH] dmarc-reports: report mail message id with domain

---
 default.nix            | 4 ++--
 mail-server/rspamd.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index 4d9b68b..b0c6076 100644
--- a/default.nix
+++ b/default.nix
@@ -41,7 +41,7 @@ in
       type = types.listOf types.str;
       example = [ "example.com" ];
       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 {
@@ -49,7 +49,7 @@ in
       example = [ "lists.example.com" ];
       default = [];
       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 {
diff --git a/mail-server/rspamd.nix b/mail-server/rspamd.nix
index 8fb9b00..42e4d43 100644
--- a/mail-server/rspamd.nix
+++ b/mail-server/rspamd.nix
@@ -73,7 +73,7 @@ in
                 domain = "${cfg.dmarcReporting.domain}";
                 org_name = "${cfg.dmarcReporting.organizationName}";
                 from_name = "${cfg.dmarcReporting.fromName}";
-                msgid_from = "dmarc-rua";
+                msgid_from = "${cfg.dmarcReporting.domain}";
               }''}
           ''; };
       };