From 260a6b4c74e5d159cb7d594e6104ab76d8c4fb79 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Thu, 26 Jun 2025 16:48:55 +0200 Subject: [PATCH] Revert "hurricane: 77 current 2025-06-26 16:44:16 25.05.20250620.b2485d5 6.15.3 *" This reverts commit 3089d2bdb4d3ce7271ad0eac1ace94ad220d772b. --- hosts/hurricane/vpn.nix | 5 +++-- hosts/wildfire/vpn.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/hurricane/vpn.nix b/hosts/hurricane/vpn.nix index 945dcee..6aa5df3 100644 --- a/hosts/hurricane/vpn.nix +++ b/hosts/hurricane/vpn.nix @@ -22,12 +22,13 @@ peers = [ { publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ="; - allowedIPs = ["95.80.0.0/18" "45.134.56.0/22" "172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0::/32"]; + allowedIPs = ["172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"]; endpoint = "prod-net-vpn1.infra.brainmill.com:51819"; persistentKeepalive = 25; } ]; }; + wg-fg = { address = ["10.255.11.11/24" "2a02:9a0:300:fff0:11::11/64"]; privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/FG-Hurricane-pk"; @@ -47,7 +48,7 @@ peers = [ { publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM="; - allowedIPs = ["185.239.220.0/22" "172.18.255.0/24" "2a09:2681::/32"]; + allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"]; endpoint = "prod-jump-got1.infra.brainmill.com:51820"; persistentKeepalive = 25; } diff --git a/hosts/wildfire/vpn.nix b/hosts/wildfire/vpn.nix index 087c0fe..b7873ad 100644 --- a/hosts/wildfire/vpn.nix +++ b/hosts/wildfire/vpn.nix @@ -21,7 +21,7 @@ peers = [ { publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ="; - allowedIPs = ["95.80.0.0/18" "45.134.56.0/22" "172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0::/32"]; + allowedIPs = ["172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"]; endpoint = "prod-net-vpn1.infra.brainmill.com:51819"; persistentKeepalive = 25; } @@ -47,7 +47,7 @@ # peers = [ # { # publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM="; - # allowedIPs = ["185.239.220.0/22" "172.18.255.0/24" "2a09:2681::/32"]; + # allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"]; # endpoint = "prod-jump-got1.infra.brainmill.com:51820"; # persistentKeepalive = 25; # }