diff --git a/hosts/ABOUTME.md b/hosts/ABOUTME.md index 27997b0..849b00a 100644 --- a/hosts/ABOUTME.md +++ b/hosts/ABOUTME.md @@ -37,7 +37,7 @@ hosts/ | `hl-bigbox2/` | hl-bigbox2 | NFS storage server; Immich server/db (docker, `immich.home.sosnovsky.ca`) | | `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI), monitoring (Grafana, Prometheus, Loki, OTel collector) | | `hl-minipc2/` | hl-minipc2 | Container/media server | -| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`, plus `gitea.skyg.ca` HTTP/SSH); buildbot-nix CI master + worker (2 cores) | +| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`, plus `gitea.skyg.ca` HTTP/SSH); serves LoopRail docs at `looprails.skyg.ca`; buildbot-nix CI master + worker (2 cores) | | `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only | | `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only | | `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup | diff --git a/hosts/hl-minipc3/services/Caddyfile b/hosts/hl-minipc3/services/Caddyfile index 7476f66..660c6e7 100644 --- a/hosts/hl-minipc3/services/Caddyfile +++ b/hosts/hl-minipc3/services/Caddyfile @@ -55,6 +55,13 @@ gitea.skyg.ca { reverse_proxy {$GITEA_IP}:80 } +looprails.skyg.ca { + tls /etc/caddy/tls/gitea/fullchain.pem /etc/caddy/tls/gitea/key.pem + root * /srv/looprails + redir /looprail.html / permanent + file_server +} + # Buzz: straight to its own caddy, LAN only. buzz.home.sosnovsky.ca { import lan_only diff --git a/hosts/hl-minipc3/services/acme.nix b/hosts/hl-minipc3/services/acme.nix index 195ee95..24d890d 100644 --- a/hosts/hl-minipc3/services/acme.nix +++ b/hosts/hl-minipc3/services/acme.nix @@ -11,6 +11,7 @@ orderBefore = [ "container-services-caddy" ]; }; certs."gitea.skyg.ca" = { + extraDomains = [ "looprails.skyg.ca" ]; postRun = "${pkgs.docker}/bin/docker restart caddy-caddy-1"; orderBefore = [ "container-services-caddy" ]; }; diff --git a/hosts/hl-minipc3/services/caddy.nix b/hosts/hl-minipc3/services/caddy.nix index e41abcf..b395819 100644 --- a/hosts/hl-minipc3/services/caddy.nix +++ b/hosts/hl-minipc3/services/caddy.nix @@ -1,5 +1,6 @@ -{ config, ... }: +{ config, looprail, pkgs, ... }: let + looprailPackages = looprail.packages.${pkgs.stdenv.hostPlatform.system}; app = config.skyg.internalNetworkingMap.apps.caddy; nvr = config.skyg.internalNetworkingMap.apps.nvr; jellyfin = config.skyg.internalNetworkingMap.apps.jellyfin; @@ -37,6 +38,10 @@ in K8S_INGRESS = k8sIngress; }; volumes = [ + (if looprailPackages ? looprail-site then + "${looprailPackages.looprail-site}:/srv/looprails:ro" + else + "${looprail}/docs/looprail.html:/srv/looprails/index.html:ro") "/var/lib/acme/${certDomain}/fullchain.pem:/etc/caddy/tls/fullchain.pem:ro" "/var/lib/acme/${certDomain}/key.pem:/etc/caddy/tls/key.pem:ro" "/var/lib/acme/${giteaCertDomain}/fullchain.pem:/etc/caddy/tls/gitea/fullchain.pem:ro" diff --git a/modules/main.nix b/modules/main.nix index 4bcd688..e0dcd8c 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -123,6 +123,7 @@ in "portainer.home.sosnovsky.ca" "immich.home.sosnovsky.ca" "gitea.skyg.ca" + "looprails.skyg.ca" ]; }; };