From 58e0705acaca79f6eb86545e4e1edcd55f0478a6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 15 Oct 2026 15:56:38 -0400 Subject: [PATCH] reversed the ingress --- hosts/hl-bigbox2/services/immich.nix | 2 +- hosts/hl-minipc3/services/caddy.nix | 14 ++++++++++++++ hosts/hl-minipc3/services/default.nix | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hosts/hl-bigbox2/services/immich.nix b/hosts/hl-bigbox2/services/immich.nix index f038e93..86c8708 100644 --- a/hosts/hl-bigbox2/services/immich.nix +++ b/hosts/hl-bigbox2/services/immich.nix @@ -12,7 +12,7 @@ let POSTGRES_DB = "immich"; DB_DATABASE_NAME = "immich"; }; - nfsVolume = skygUtils.container-services.nfs.tnas1; + nfsVolume = skygUtils.container-services.nfsVols.tnas1; in { age.secrets.immich-shared.file = skyg-secrets.immich-shared; diff --git a/hosts/hl-minipc3/services/caddy.nix b/hosts/hl-minipc3/services/caddy.nix index 7c5dd2d..42a262f 100644 --- a/hosts/hl-minipc3/services/caddy.nix +++ b/hosts/hl-minipc3/services/caddy.nix @@ -8,6 +8,8 @@ let publicGitea = config.skyg.internalNetworkingMap.apps.public-gitea; certDomain = "home.sosnovsky.ca"; giteaCertDomain = "gitea.skyg.ca"; + # k8s Traefik ingress — fallback for hosts caddy doesn't handle itself. + k8sIngress = "10.0.100.1"; in { skyg.nixos.common.container-services.caddy = { @@ -49,6 +51,18 @@ in tls /etc/caddy/tls/gitea/fullchain.pem /etc/caddy/tls/gitea/key.pem reverse_proxy ${publicGitea.ip}:80 } + # Fallback: any other *.home.sosnovsky.ca host goes to the k8s Traefik. + # Host + SNI are preserved so Traefik routes on the original hostname. + *.home.sosnovsky.ca { + tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem + reverse_proxy https://${k8sIngress}:443 { + header_up Host {http.request.host} + transport http { + tls + tls_server_name {http.request.host} + } + } + } ''; volumes = [ "/var/lib/acme/${certDomain}/fullchain.pem:/etc/caddy/tls/fullchain.pem:ro" diff --git a/hosts/hl-minipc3/services/default.nix b/hosts/hl-minipc3/services/default.nix index f480968..4b8fcc3 100644 --- a/hosts/hl-minipc3/services/default.nix +++ b/hosts/hl-minipc3/services/default.nix @@ -2,6 +2,6 @@ imports = [ ./caddy.nix ./acme.nix - ./buildbot.nix + # ./buildbot.nix ]; }