From aa9b48fcc977c3b87928855dc261a9e856354236 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Thu, 12 Jun 2025 15:05:40 -0400 Subject: [PATCH] Add extra domain names for kwahson and toph in ACME configuration; update dnsmasq for blog.toph.cc --- hosts/global/common/acme/default.nix | 12 ++++++------ hosts/nixos/komo/config/caddy.nix | 17 +++++++++++------ hosts/nixos/proxy/config/dnsmasq.nix | 4 +++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/hosts/global/common/acme/default.nix b/hosts/global/common/acme/default.nix index 0406d1a..d893f1c 100644 --- a/hosts/global/common/acme/default.nix +++ b/hosts/global/common/acme/default.nix @@ -34,13 +34,13 @@ in # extraDomainNames = [ "*.kwahson.com" ]; # }; - # "kwahson.xyz" = { - # extraDomainNames = [ "*.kwahson.xyz" ]; - # }; + "kwahson.xyz" = { + extraDomainNames = [ "*.kwahson.xyz" ]; + }; - # "toph.cc" = { - # extraDomainNames = [ "*.toph.cc" ]; - # }; + "toph.cc" = { + extraDomainNames = [ "*.toph.cc" ]; + }; "ryot.foo" = { extraDomainNames = [ "*.ryot.foo" ]; diff --git a/hosts/nixos/komo/config/caddy.nix b/hosts/nixos/komo/config/caddy.nix index 89a51dd..088356d 100644 --- a/hosts/nixos/komo/config/caddy.nix +++ b/hosts/nixos/komo/config/caddy.nix @@ -2,12 +2,17 @@ services.caddy = { enable = true; virtualHosts = { - # "ryot.foo" = { - # useACMEHost = "ryot.foo"; - # extraConfig = '' - # reverse_proxy 104.40.3.44:80 - # ''; - # }; + + ## TOPH.CC ## + + "blog.toph.cc" = { + useACMEHost = "toph.cc"; + extraConfig = '' + reverse_proxy localhost:2368 + ''; + }; + + ## RYOT.FOO ## "auth.ryot.foo" = { useACMEHost = "ryot.foo"; diff --git a/hosts/nixos/proxy/config/dnsmasq.nix b/hosts/nixos/proxy/config/dnsmasq.nix index b980e34..3e98a8e 100644 --- a/hosts/nixos/proxy/config/dnsmasq.nix +++ b/hosts/nixos/proxy/config/dnsmasq.nix @@ -19,7 +19,7 @@ ]; # INFO: Why this setup for services? - # - OpenWRT forwards every *.ryot.foo query to this DNS server + # - OpenWRT forwards every *ryot.foo and *toph.cc query to this DNS server # - dnsmasq hands out fixed IPs for those subdomains. # - Each target host runs Caddy to serve its site. # No Docker labels, no discovery magic—just reliable routing clearly documented with Nix. @@ -48,6 +48,8 @@ "/outline.ryot.foo/104.40.3.44" "/plane.ryot.foo/104.40.3.44" + "/blog.toph.cc/104.40.3.44" + ## SOCK ## "/upsnap.ryot.foo/104.40.3.54" "/sock.ryot.foo/104.40.3.54"