diff --git a/hosts/m3-hermes/services/ai-memory.nix b/hosts/m3-hermes/services/ai-memory.nix index e605205..5427b64 100644 --- a/hosts/m3-hermes/services/ai-memory.nix +++ b/hosts/m3-hermes/services/ai-memory.nix @@ -3,10 +3,8 @@ pkgs, ... }: let - # Netbird mesh VPN range — the server is only reachable from mesh peers. - # m3-atlas Traefik proxies memory.m3ta.dev to this port over Netbird. - # (Fleet mesh address block is 100.81.0.0/16 — kernel route on wt0.) - netbirdRange = "100.81.0.0/16"; + # Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s + # would abort the ip6tables run of ip46tables and fail the unit. port = config.m3ta.ports.get "ai-memory"; in { # ── ai-memory server ────────────────────────────────────────────────── @@ -47,11 +45,11 @@ in { networking.firewall = { extraCommands = '' # Allow ai-memory only from Netbird mesh VPN - ip46tables -A nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept ''; extraStopCommands = '' - ip46tables -D nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true + ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true ''; }; } diff --git a/hosts/m3-hermes/services/hermes-dashboard.nix b/hosts/m3-hermes/services/hermes-dashboard.nix index effcb13..25222f1 100644 --- a/hosts/m3-hermes/services/hermes-dashboard.nix +++ b/hosts/m3-hermes/services/hermes-dashboard.nix @@ -4,9 +4,8 @@ inputs, ... }: let - # Netbird mesh VPN range — dashboard only accessible from mesh peers. - # m3-atlas Traefik proxies to this port over Netbird. - netbirdRange = "100.81.0.0/16"; + # Mesh-only via interface match on wt0 (NetBird) — works for ip46tables + # where an IPv4 CIDR in -s would abort the ip6tables run. apiPort = config.m3ta.ports.get "hermes-api"; dashboardPort = config.m3ta.ports.get "hermes-dashboard"; @@ -57,13 +56,13 @@ in { networking.firewall = { extraCommands = '' # Allow Hermes Dashboard and OpenAI-compatible API only from Netbird mesh VPN - ip46tables -A nixos-fw -p tcp --dport ${toString dashboardPort} -s ${netbirdRange} -j nixos-fw-accept - ip46tables -A nixos-fw -p tcp --dport ${toString apiPort} -s ${netbirdRange} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept ''; extraStopCommands = '' - ip46tables -D nixos-fw -p tcp --dport ${toString dashboardPort} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true - ip46tables -D nixos-fw -p tcp --dport ${toString apiPort} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true + ip46tables -D nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true + ip46tables -D nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true ''; }; } diff --git a/hosts/m3-hermes/services/t3code.nix b/hosts/m3-hermes/services/t3code.nix index 6f98d1a..c5a8242 100644 --- a/hosts/m3-hermes/services/t3code.nix +++ b/hosts/m3-hermes/services/t3code.nix @@ -25,8 +25,8 @@ pkgs, ... }: let - # NetBird mesh range of this fleet (kernel route: 100.81.0.0/16 dev wt0). - netbirdRange = "100.81.0.0/16"; + # Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s + # would abort the ip6tables run of ip46tables and fail the unit. port = config.m3ta.ports.get "t3code"; in { # CLI on the system for interactive admin (t3 pair, t3 service status) @@ -67,11 +67,11 @@ in { networking.firewall = { extraCommands = '' # Allow t3code only from Netbird mesh VPN - ip46tables -A nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept ''; extraStopCommands = '' - ip46tables -D nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true + ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true ''; }; }