diff --git a/hosts/kaoru/os/configuration.nix b/hosts/kaoru/os/configuration.nix index 5636027..ca9fe05 100644 --- a/hosts/kaoru/os/configuration.nix +++ b/hosts/kaoru/os/configuration.nix @@ -59,15 +59,6 @@ openFirewall = true; openInternalFirewall = true; }; - wt0 = { - port = 51821; - login = { - enable = true; - setupKeyFile = "${pkgs.writeText "one-time-key" "0C185300-F30B-4C4B-8B55-6383B615AA26"}"; - }; - openFirewall = true; - openInternalFirewall = true; - }; }; }; } diff --git a/hosts/lala/default.nix b/hosts/lala/default.nix index 925c34e..bcba643 100644 --- a/hosts/lala/default.nix +++ b/hosts/lala/default.nix @@ -22,18 +22,6 @@ ssh.pubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMh1dUFmdYFPMsKoidEzYyGjQkG/GMl4F7yoB4BidEFO hiyama@lala"; }; - services.netbird = { - clients.wt0 = { - port = 51821; - login = { - enable = true; - setupKeyFile = "${pkgs.writeText "one-time-key" "4EA018E4-F27C-498E-9DAD-FB9E9D2E52C6"}"; - }; - openFirewall = true; - openInternalFirewall = true; - }; - }; - sops = { defaultSopsFile = ../../secrets/secrets.yaml; defaultSopsFormat = "yaml"; diff --git a/hosts/tsumugi/reverseProxy.nix b/hosts/tsumugi/reverseProxy.nix index 603f100..bfd9197 100644 --- a/hosts/tsumugi/reverseProxy.nix +++ b/hosts/tsumugi/reverseProxy.nix @@ -6,35 +6,6 @@ ... }: { - sops.secrets."tsumugi/wgpk" = { }; - networking.firewall.allowedUDPPorts = [ 9546 ]; - networking.wg-quick.interfaces.ochiai = { - listenPort = 9546; - address = [ "10.0.0.2/24" ]; - privateKeyFile = config.sops.secrets."tsumugi/wgpk".path; - table = "1234"; - postUp = "ip rule add pref 500 from 10.0.0.2 lookup 1234"; - postDown = "ip rule delete pref 500"; - peers = [ - { - publicKey = "UoMs4Mtp59wHfJwGLygNe01W3vrBXEevEElZ+rs27Xs="; - allowedIPs = [ "0.0.0.0/0" ]; - endpoint = "ochiai.moppu.dev:5964"; - persistentKeepalive = 25; - } - ]; - }; - - sops.secrets."tsumugi/cloudflare" = { - #owner = "cloudflared"; - }; - services.cloudflared = { - enable = true; - tunnels.tsumugi = { - credentialsFile = config.sops.secrets."tsumugi/cloudflare".path; - default = "http_status:404"; - }; - }; services.netbird = { useRoutingFeatures = "both"; clients = { @@ -51,15 +22,6 @@ openFirewall = true; openInternalFirewall = true; }; - wt0 = { - port = 51821; - login = { - enable = true; - setupKeyFile = "${pkgs.writeText "one-time-key" "5EA0A6CF-1610-4E9A-9AC3-DD0F139A1928"}"; - }; - openFirewall = true; - openInternalFirewall = true; - }; }; }; } diff --git a/hosts/tsumugi/transmission.nix b/hosts/tsumugi/transmission.nix index 03cb7d3..03124ec 100644 --- a/hosts/tsumugi/transmission.nix +++ b/hosts/tsumugi/transmission.nix @@ -25,7 +25,7 @@ in hostAddress = "192.168.${toString id}.10"; localAddress = "192.168.${toString id}.11"; hostRoutes = [ - "100.70.0.0/16" # netbird + "100.109.0.0/16" # netbird "10.0.4.0/24" # home subnet "192.168.0.0/16" # container subnet ]; @@ -95,7 +95,7 @@ in rpc-authentication-required = true; anti-brute-force-enabled = true; rpc-whitelist = lib.concatStringsSep "," [ - "100.70.*.*" + "100.109.*.*" "10.0.4.*" "192.168.*.*" ]; diff --git a/hosts/yuhata/os/configuration.nix b/hosts/yuhata/os/configuration.nix index f5c6031..1997ef5 100644 --- a/hosts/yuhata/os/configuration.nix +++ b/hosts/yuhata/os/configuration.nix @@ -81,15 +81,6 @@ openFirewall = true; openInternalFirewall = true; }; - wt0 = { - port = 51821; - login = { - enable = true; - setupKeyFile = "${pkgs.writeText "one-time-key" "28F1E05B-AB2B-491B-B91E-37D97FDD051F"}"; - }; - openFirewall = true; - openInternalFirewall = true; - }; }; }; }