From d9964cd689e49cb62604865432732176974055e1 Mon Sep 17 00:00:00 2001 From: Ruben Hensen Date: Thu, 26 Mar 2026 11:19:32 +0100 Subject: [PATCH] Fix the dns for rubenhensen.nl --- dns/domains/rubenhensen.nl.yaml | 36 ++++++++++++------------- nix-infra-machine/nodes/node001.nix | 41 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/dns/domains/rubenhensen.nl.yaml b/dns/domains/rubenhensen.nl.yaml index 3f99ce3..61f54a9 100644 --- a/dns/domains/rubenhensen.nl.yaml +++ b/dns/domains/rubenhensen.nl.yaml @@ -13,12 +13,12 @@ records: content: "46.224.26.65" - name: "phocaslustrum" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "ynab" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "authentik" expire: 86400 type: A @@ -29,32 +29,32 @@ records: content: "62.41.87.114" - name: "argocd" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "vault" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "rss" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "ha" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "longhorn" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "lingo" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "blog" expire: 86400 - type: CNAME - content: "@" + type: A + content: "62.41.87.114" - name: "@" expire: 86400 type: MX diff --git a/nix-infra-machine/nodes/node001.nix b/nix-infra-machine/nodes/node001.nix index 40814c5..38e498f 100644 --- a/nix-infra-machine/nodes/node001.nix +++ b/nix-infra-machine/nodes/node001.nix @@ -22,6 +22,11 @@ group = "stalwart-mail"; reloadServices = [ "stalwart-mail" ]; webroot = "/var/lib/acme/acme-challenge"; + extraDomainNames = [ + "autoconfig.rubenhensen.nl" + "autodiscover.rubenhensen.nl" + "rubenhensen.nl" + ]; }; }; @@ -44,6 +49,42 @@ return = "301 https://$host$request_uri"; }; }; + virtualHosts."autoconfig.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"; + }; + }; + virtualHosts."autodiscover.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"; + }; + }; + virtualHosts."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"; + }; + }; }; # ──────────────────────────────────────────────