mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-11-18 14:29:09 +01:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0cf02ce86 | ||
|
|
634cd883e5 | ||
|
|
5bf7892cca | ||
|
|
ebf94f62e0 | ||
|
|
9e7b2099f1 | ||
|
|
be173c571f |
@@ -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; }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user