mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-11-18 14:29:09 +01:00
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.
This commit is contained in:
1 parent
634cd883e5
commit
c0cf02ce86
2 files changed
+16
-13
No files matched your search
@@ -152,6 +152,7 @@ in
|
||||
extraDomainNames = [
|
||||
"autoconfig.rubenhensen.nl"
|
||||
"autodiscover.rubenhensen.nl"
|
||||
"mta-sts.rubenhensen.nl"
|
||||
"rubenhensen.nl"
|
||||
];
|
||||
# Keep the same key on renewal. The TLSA record in
|
||||
@@ -242,6 +243,16 @@ ${sniMapEntries}
|
||||
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
|
||||
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" = {
|
||||
listen = [
|
||||
{ addr = "0.0.0.0"; port = 80; }
|
||||
@@ -446,7 +457,9 @@ ${sniMapEntries}
|
||||
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}%";
|
||||
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; }
|
||||
];
|
||||
|
||||
|
||||
Reference in new issue
Block a user