From 4480302c65f5c7225f93cc2716fb81db6479524d Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Mon, 1 Dec 2025 22:41:13 +0000 Subject: [PATCH] nixos/estuary: Remove old Frys-IX subnet --- nixos/boxes/colony/vms/estuary/bgp.nix | 34 ---------------------- nixos/boxes/colony/vms/estuary/default.nix | 5 +--- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/nixos/boxes/colony/vms/estuary/bgp.nix b/nixos/boxes/colony/vms/estuary/bgp.nix index 2c6afc3..8e15764 100644 --- a/nixos/boxes/colony/vms/estuary/bgp.nix +++ b/nixos/boxes/colony/vms/estuary/bgp.nix @@ -233,24 +233,6 @@ in neighbor 2a07:cd40:1::9 as 202413; } - protocol bgp ixp4_frysix_rs1 from ixp_bgp4 { - description "Frys-IX route server 1 (IPv4)"; - neighbor 185.1.203.253 as 56393; - } - protocol bgp ixp6_frysix_rs1 from ixp_bgp6 { - description "Frys-IX route server 1 (IPv6)"; - neighbor 2001:7f8:10f::dc49:253 as 56393; - } - - protocol bgp ixp4_frysix_rs2 from ixp_bgp4 { - description "Frys-IX route server 2 (IPv4)"; - neighbor 185.1.203.254 as 56393; - } - protocol bgp ixp6_frysix_rs2 from ixp_bgp6 { - description "Frys-IX route server 2 (IPv6)"; - neighbor 2001:7f8:10f::dc49:254 as 56393; - } - protocol bgp ixp4_frysix_rs3 from ixp_bgp4 { description "Frys-IX route server 3 (IPv4)"; neighbor 185.1.160.255 as 56393; @@ -283,14 +265,6 @@ in neighbor 185.1.160.154 as 6939; } - protocol bgp peer4_frysix_cloudflare1_old from peer_bgp4 { - description "Cloudflare 1 (on Frys-IX, IPv4)"; - neighbor 185.1.203.217 as 13335; - } - protocol bgp peer4_frysix_cloudflare2_old from peer_bgp4 { - description "Cloudflare 2 (on Frys-IX, IPv4)"; - neighbor 185.1.203.109 as 13335; - } protocol bgp peer4_frysix_cloudflare1 from peer_bgp4 { description "Cloudflare 1 (on Frys-IX, IPv4)"; neighbor 185.1.160.217 as 13335; @@ -317,14 +291,6 @@ in neighbor 2001:7f8:10f::3:3e9b:134 as 212635; } - protocol bgp peer4_frysix_meta1_old from peer_bgp4 { - description "Meta 1 (on Frys-IX, IPv4)"; - neighbor 185.1.203.225 as 32934; - } - protocol bgp peer4_frysix_meta2_old from peer_bgp4 { - description "Meta 2 (on Frys-IX, IPv4)"; - neighbor 185.1.203.226 as 32934; - } protocol bgp peer4_frysix_meta1 from peer_bgp4 { description "Meta 1 (on Frys-IX, IPv4)"; neighbor 185.1.160.225 as 32934; diff --git a/nixos/boxes/colony/vms/estuary/default.nix b/nixos/boxes/colony/vms/estuary/default.nix index 3e646ac..306764f 100644 --- a/nixos/boxes/colony/vms/estuary/default.nix +++ b/nixos/boxes/colony/vms/estuary/default.nix @@ -237,10 +237,7 @@ in in mkMerge [ - (mkIXPConfig "frys-ix" "185.1.203.196/24" "2001:7f8:10f::3:3850:196/64") - # FrysIX is migrating to a /23 - { "85-frys-ix".address = [ "185.1.160.196/23" ]; } - + (mkIXPConfig "frys-ix" "185.1.160.196/23" "2001:7f8:10f::3:3850:196/64") (mkIXPConfig "nl-ix" "193.239.116.145/22" "2001:7f8:13::a521:1024:1/64") (mkIXPConfig "fogixp" "185.1.147.159/24" "2001:7f8:ca:1::159/64") {