From c0cf02ce86baca8cb392e35185421cffc7468db5 Mon Sep 17 00:00:00 2001 From: Ruben Hensen Date: Wed, 18 Nov 2026 11:00:07 +0100 Subject: [PATCH] mail: reachable MTA-STS policy, and sign bounces and reports The certificate did not cover mta-sts.rubenhensen.nl, so senders could not fetch the MTA-STS policy. Add the name, and a port 80 host for its ACME challenge. Stalwart signs bounces and DMARC/TLS reports with the DKIM signers named rsa- and ed25519-. Ours were called rsa and ed25519, so those messages went out unsigned. Rename them. A new name on the certificate means a new key, so the TLSA record comes out here and goes back with the new hash after the deploy. --- dns/domains/rubenhensen.nl.yaml | 10 ---------- nix-infra-machine/nodes/node001.nix | 19 ++++++++++++++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dns/domains/rubenhensen.nl.yaml b/dns/domains/rubenhensen.nl.yaml index c6af7dd..8d1c4be 100644 --- a/dns/domains/rubenhensen.nl.yaml +++ b/dns/domains/rubenhensen.nl.yaml @@ -146,13 +146,3 @@ records: expire: 300 type: TXT content: "v=TLSRPTv1; rua=mailto:postmaster@rubenhensen.nl" - # DANE for inbound mail: SHA-256 of the public key in the certificate - # for mail.rubenhensen.nl. Renewals keep that key (--reuse-key in - # nix-infra-machine/nodes/node001.nix). To check it against the server: - # openssl s_client -connect mail.rubenhensen.nl:25 -starttls smtp and ed25519-, so keep these names. + signature."rsa-rubenhensen.nl" = { private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-rsa.key}%"; domain = "rubenhensen.nl"; selector = "202603r2"; @@ -458,7 +471,7 @@ ${sniMapEntries} report = true; }; - signature."ed25519" = { + signature."ed25519-rubenhensen.nl" = { private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-ed25519.key}%"; domain = "rubenhensen.nl"; selector = "202603e2"; @@ -470,7 +483,7 @@ ${sniMapEntries} }; auth.dkim.sign = [ - { "if" = "listener != 'smtp'"; "then" = "['rsa', 'ed25519']"; } + { "if" = "listener != 'smtp'"; "then" = "['rsa-rubenhensen.nl', 'ed25519-rubenhensen.nl']"; } { "else" = false; } ];