Compare commits

...
Author SHA1 Message Date
Ruben Hensen c0cf02ce86 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-<domain> and ed25519-<domain>. 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.
2026-11-18 11:00:07 +01:00
Ruben Hensen 634cd883e5 Merge pull request #81 from rubenhensen/dane-tlsa
dns: publish a TLSA record for the mail certificate key
2026-11-18 10:47:19 +01:00
Ruben Hensen 5bf7892cca dns: publish a TLSA record for the mail certificate key
One 3 1 1 record with the SHA-256 of the public key that Stalwart serves
since today's deploy. Renewals keep that key, so the record stays valid.
2026-11-18 10:46:55 +01:00
Ruben Hensen ebf94f62e0 Merge pull request #80 from rubenhensen/dane-reuse-key
node001: keep the mail certificate key on renewal
2026-11-18 10:43:05 +01:00
Ruben Hensen 9e7b2099f1 node001: keep the mail certificate key on renewal
Each renewal made a new key, so a TLSA record that pins the key went
stale every 60 days. With --reuse-key the key stays, and one 3 1 1
record can describe it.

Deploying this orders a new certificate once, with a new key, because
NixOS hashes the lego flags. The TLSA record goes in after that.
2026-11-18 10:42:04 +01:00
Ruben Hensen be173c571f Merge pull request #79 from rubenhensen/remove-stale-tlsa
dns: remove the stale TLSA records for mail
2026-11-18 10:38:15 +01:00
+23 -3
View File
@@ -152,8 +152,16 @@ in
extraDomainNames = [ extraDomainNames = [
"autoconfig.rubenhensen.nl" "autoconfig.rubenhensen.nl"
"autodiscover.rubenhensen.nl" "autodiscover.rubenhensen.nl"
"mta-sts.rubenhensen.nl"
"rubenhensen.nl" "rubenhensen.nl"
]; ];
# Keep the same key on renewal. The TLSA record in
# dns/domains/rubenhensen.nl.yaml pins this key, and senders that
# enforce DANE stop delivering when the two differ. Changing the
# names or the lego flags of this cert makes NixOS order a new one
# with a fresh key, so take the record out first and put the new
# hash back afterwards.
extraLegoRenewFlags = [ "--reuse-key" ];
}; };
}; };
@@ -235,6 +243,16 @@ ${sniMapEntries}
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge"; locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
locations."/".return = "301 https://$host$request_uri"; locations."/".return = "301 https://$host$request_uri";
}; };
# Senders fetch the MTA-STS policy from here over HTTPS. Stalwart
# serves it, so the certificate has to carry this name too.
"mta-sts.rubenhensen.nl" = {
listen = [
{ addr = "0.0.0.0"; port = 80; }
{ addr = "[::]"; port = 80; }
];
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
locations."/".return = "301 https://$host$request_uri";
};
"rubenhensen.nl" = { "rubenhensen.nl" = {
listen = [ listen = [
{ addr = "0.0.0.0"; port = 80; } { addr = "0.0.0.0"; port = 80; }
@@ -439,7 +457,9 @@ ${sniMapEntries}
client-secret = "%{file:/run/credentials/stalwart-mail.service/oidc-client-secret}%"; client-secret = "%{file:/run/credentials/stalwart-mail.service/oidc-client-secret}%";
}; };
signature."rsa" = { # Stalwart signs bounces and DMARC/TLS reports with the signers
# named rsa-<domain> and ed25519-<domain>, so keep these names.
signature."rsa-rubenhensen.nl" = {
private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-rsa.key}%"; private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-rsa.key}%";
domain = "rubenhensen.nl"; domain = "rubenhensen.nl";
selector = "202603r2"; selector = "202603r2";
@@ -451,7 +471,7 @@ ${sniMapEntries}
report = true; report = true;
}; };
signature."ed25519" = { signature."ed25519-rubenhensen.nl" = {
private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-ed25519.key}%"; private-key = "%{file:/run/credentials/stalwart-mail.service/dkim-ed25519.key}%";
domain = "rubenhensen.nl"; domain = "rubenhensen.nl";
selector = "202603e2"; selector = "202603e2";
@@ -463,7 +483,7 @@ ${sniMapEntries}
}; };
auth.dkim.sign = [ auth.dkim.sign = [
{ "if" = "listener != 'smtp'"; "then" = "['rsa', 'ed25519']"; } { "if" = "listener != 'smtp'"; "then" = "['rsa-rubenhensen.nl', 'ed25519-rubenhensen.nl']"; }
{ "else" = false; } { "else" = false; }
]; ];