mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-11-18 14:29:09 +01:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3634ba7283 |
No files matched your search
@@ -146,3 +146,35 @@ records:
|
|||||||
expire: 300
|
expire: 300
|
||||||
type: TXT
|
type: TXT
|
||||||
content: "v=TLSRPTv1; rua=mailto:postmaster@rubenhensen.nl"
|
content: "v=TLSRPTv1; rua=mailto:postmaster@rubenhensen.nl"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "3 0 1 7926a9616cea1a7fb851fbdab631b2b2f6f71d3a775178d3288e539b9f53b18d"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "3 0 2 2218e33f102e805841f2f6a368e6416d884a8658cd9f45ef9b28c233dc6803320cff976e8ffdb1c0603a7abe60ccf78de422c31753b6cece8bc7ec1b80de5b66"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "3 1 1 e473431a9f296a8d93dfbed7c6c9485d6dadf7b460879edc0fe905183fe78a41"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "3 1 2 4c6cdab2a9cad307ba5b77ef34bde0cc2846b3d27aef6ce9625c56ef11b5c9cd1ede662c3afa759a3190e6317df494564ac83e4bfe3e6467f3c1bf307d781d4a"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "2 0 1 aeb1fd7410e83bc96f5da3c6a7c2c1bb836d1fa5cb86e708515890e428a8770b"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "2 0 2 e18f3d6ccbc578f025c3c7c29ed7bffe1b8eef5b1f839c17298dcf218303d2a63e305f6c1f489691774a18bad836035e5af2de1fc42a3a26cfe9e530f92e3855"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "2 1 1 cbbc559b44d524d6a132bdac672744da3407f12aae5d5f722c5f6c7913871c75"
|
||||||
|
- name: "_25._tcp.mail"
|
||||||
|
expire: 300
|
||||||
|
type: TLSA
|
||||||
|
content: "2 1 2 7d779dd26d37ca5a72fd05f1b815a06078c8e09777697c651fbe012c8d2894e048fcfe24160ee1562602240b6bef44e00f2b7340c84546d6110842bbdeb484a7"
|
||||||
@@ -152,16 +152,8 @@ 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" ];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -243,16 +235,6 @@ ${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; }
|
||||||
@@ -457,9 +439,7 @@ ${sniMapEntries}
|
|||||||
client-secret = "%{file:/run/credentials/stalwart-mail.service/oidc-client-secret}%";
|
client-secret = "%{file:/run/credentials/stalwart-mail.service/oidc-client-secret}%";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Stalwart signs bounces and DMARC/TLS reports with the signers
|
signature."rsa" = {
|
||||||
# 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";
|
||||||
@@ -471,7 +451,7 @@ ${sniMapEntries}
|
|||||||
report = true;
|
report = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
signature."ed25519-rubenhensen.nl" = {
|
signature."ed25519" = {
|
||||||
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";
|
||||||
@@ -483,7 +463,7 @@ ${sniMapEntries}
|
|||||||
};
|
};
|
||||||
|
|
||||||
auth.dkim.sign = [
|
auth.dkim.sign = [
|
||||||
{ "if" = "listener != 'smtp'"; "then" = "['rsa-rubenhensen.nl', 'ed25519-rubenhensen.nl']"; }
|
{ "if" = "listener != 'smtp'"; "then" = "['rsa', 'ed25519']"; }
|
||||||
{ "else" = false; }
|
{ "else" = false; }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ spec:
|
|||||||
source:
|
source:
|
||||||
chart: velero
|
chart: velero
|
||||||
repoURL: https://vmware-tanzu.github.io/helm-charts
|
repoURL: https://vmware-tanzu.github.io/helm-charts
|
||||||
targetRevision: 12.2.3
|
targetRevision: 12.2.5
|
||||||
helm:
|
helm:
|
||||||
values: |
|
values: |
|
||||||
# Velero builds its repository maintenance jobs from a Deployment
|
# Velero builds its repository maintenance jobs from a Deployment
|
||||||
|
|||||||
Reference in new issue
Block a user