From 15e12613fb450cb8f47ac6a3341ef0af9259125f Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Tue, 17 Nov 2026 12:34:59 +0000 Subject: [PATCH] nixos/estuary: Update LUJE and NL-ix peering Replace the ColoClue LUJE sessions with IPv6 peering on Clue-IX. Add IPv4 and IPv6 LUJE sessions on NL-ix. Share the lower NL-ix peer preference through dedicated templates, including Meta alongside the other NL-ix direct peers. --- docs/sites/colony/estuary.md | 6 ++- nixos/boxes/colony/vms/estuary/bgp.nix | 66 +++++++++++++------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/docs/sites/colony/estuary.md b/docs/sites/colony/estuary.md index 7e72b91..3ee6d0a 100644 --- a/docs/sites/colony/estuary.md +++ b/docs/sites/colony/estuary.md @@ -117,7 +117,7 @@ BIRD2 ([`bgp.nix`](../../../nixos/boxes/colony/vms/estuary/bgp.nix)) speaking ** | Frys-IX | AS56393 | IXP route server | | | NL-ix | AS34307 | IXP route server | lower preference | | FogIXP | AS47498 | IXP route server | | -| LUJE.net | AS212855 | Direct peer | ColoClue/Frys-IX/FogIXP + multihop labs | +| LUJE.net | AS212855 | Direct peer | Clue-IX (IPv6), Frys-IX/FogIXP/NL-ix (v4+v6); NL-ix lower preference; multihop labs | | jurrian | AS212635 | Direct peer | | | Meta | AS32934 | Direct peer | Frys-IX/NL-ix | | Cloudflare | AS13335 | Direct peer | Frys-IX | @@ -129,6 +129,10 @@ Statics originate the site prefixes: the `vip*` ranges via `base`, the ams1/internal v6 prefixes via `base`/`as211024`, and the home /48 towards the home routers' `as211024` VIP. +NL-ix direct peers use `nlix_peer_bgp4` / `nlix_peer_bgp6`, which inherit the +normal peer policy with preference `PREFPEER-1`. Meta uses the same lower +NL-ix preference as the other direct peers. + Currently disabled (commented out): efero transit over FogIXP ("not working so well lately") and the NL-ix Cloudflare sessions. diff --git a/nixos/boxes/colony/vms/estuary/bgp.nix b/nixos/boxes/colony/vms/estuary/bgp.nix index 376185f..b68bae2 100644 --- a/nixos/boxes/colony/vms/estuary/bgp.nix +++ b/nixos/boxes/colony/vms/estuary/bgp.nix @@ -140,6 +140,9 @@ in preference PREFPEER; }; } + template bgp nlix_peer_bgp4 from peer_bgp4 { + ipv4 { preference (PREFPEER-1); }; + } template bgp ixp_bgp4 from base_bgp4 { ipv4 { import filter bgp_import; @@ -170,6 +173,9 @@ in preference PREFPEER; }; } + template bgp nlix_peer_bgp6 from peer_bgp6 { + ipv6 { preference (PREFPEER-1); }; + } template bgp ixp_bgp6 from base_bgp6 { ipv6 { import filter bgp_import; @@ -219,14 +225,6 @@ in # neighbor 2001:7f8:ca:1::107 as 208431; # } - protocol bgp peer4_cc_luje from peer_bgp4 { - description "LUJE.net (on ColoClue, IPv4)"; - neighbor 94.142.240.20 as 212855; - } - protocol bgp peer6_cc_luje from peer_bgp6 { - description "LUJE.net (on ColoClue, IPv6)"; - neighbor 2a02:898:0:20::166:1 as 212855; - } protocol bgp peer6_luje_labs from peer_bgp6 { description "LUJE.net labs (IPv6)"; multihop 3; @@ -247,6 +245,11 @@ in neighbor 2001:7f8:154::21:8511:2 as 218511; } + protocol bgp peer6_clueix_luje from peer_bgp6 { + description "LUJE.net (on Clue-IX, IPv6)"; + neighbor 2001:7f8:154::21:2855:1 as 212855; + } + protocol bgp ixp4_frysix_rs3 from ixp_bgp4 { description "Frys-IX route server 3 (IPv4)"; neighbor 185.1.160.255 as 56393; @@ -305,19 +308,28 @@ in neighbor 2001:7f8:10f::3:3e9b:134 as 212635; } - protocol bgp peer4_nlix_meta1 from peer_bgp4 { + protocol bgp peer4_nlix_luje from nlix_peer_bgp4 { + description "LUJE.net (on NL-ix, IPv4)"; + neighbor 193.239.116.87 as 212855; + } + protocol bgp peer6_nlix_luje from nlix_peer_bgp6 { + description "LUJE.net (on NL-ix, IPv6)"; + neighbor 2001:7f8:13::a521:2855:1 as 212855; + } + + protocol bgp peer4_nlix_meta1 from nlix_peer_bgp4 { description "Meta 1 (on NL-ix, IPv4)"; neighbor 193.239.116.147 as 32934; } - protocol bgp peer4_nlix_meta2 from peer_bgp4 { + protocol bgp peer4_nlix_meta2 from nlix_peer_bgp4 { description "Meta 2 (on NL-ix, IPv4)"; neighbor 193.239.116.148 as 32934; } - protocol bgp peer6_nlix_meta1 from peer_bgp6 { + protocol bgp peer6_nlix_meta1 from nlix_peer_bgp6 { description "Meta 1 (on NL-ix, IPv6)"; neighbor 2001:7f8:13::a503:2934:1 as 32934; } - protocol bgp peer6_nlix_meta2 from peer_bgp6 { + protocol bgp peer6_nlix_meta2 from nlix_peer_bgp6 { description "Meta 2 (on NL-ix, IPv6)"; neighbor 2001:7f8:13::a503:2934:2 as 32934; } @@ -361,55 +373,45 @@ in ipv6 { preference (PREFIXP-1); }; } - # protocol bgp peer4_nlix_cloudflare1 from peer_bgp4 { + # protocol bgp peer4_nlix_cloudflare1 from nlix_peer_bgp4 { # description "Cloudflare NL-ix 1 (IPv4)"; # neighbor 193.239.117.14 as 13335; - # ipv4 { preference (PREFPEER-1); }; # } - # protocol bgp peer4_nlix_cloudflare2 from peer_bgp4 { + # protocol bgp peer4_nlix_cloudflare2 from nlix_peer_bgp4 { # description "Cloudflare NL-ix 2 (IPv4)"; # neighbor 193.239.117.114 as 13335; - # ipv4 { preference (PREFPEER-1); }; # } - # protocol bgp peer4_nlix_cloudflare3 from peer_bgp4 { + # protocol bgp peer4_nlix_cloudflare3 from nlix_peer_bgp4 { # description "Cloudflare NL-ix 3 (IPv4)"; # neighbor 193.239.118.138 as 13335; - # ipv4 { preference (PREFPEER-1); }; # } - # protocol bgp peer6_nlix_cloudflare1 from peer_bgp6 { + # protocol bgp peer6_nlix_cloudflare1 from nlix_peer_bgp6 { # description "Cloudflare NL-ix 1 (IPv6)"; # neighbor 2001:7f8:13::a501:3335:1 as 13335; - # ipv6 { preference (PREFPEER-1); }; # } - # protocol bgp peer6_nlix_cloudflare2 from peer_bgp6 { + # protocol bgp peer6_nlix_cloudflare2 from nlix_peer_bgp6 { # description "Cloudflare NL-ix 2 (IPv6)"; # neighbor 2001:7f8:13::a501:3335:2 as 13335; - # ipv6 { preference (PREFPEER-1); }; # } - # protocol bgp peer6_nlix_cloudflare3 from peer_bgp6 { + # protocol bgp peer6_nlix_cloudflare3 from nlix_peer_bgp6 { # description "Cloudflare NL-ix 3 (IPv6)"; # neighbor 2001:7f8:13::a501:3335:3 as 13335; - # ipv6 { preference (PREFPEER-1); }; # } - protocol bgp peer4_nlix_jurrian from peer_bgp4 { + protocol bgp peer4_nlix_jurrian from nlix_peer_bgp4 { description "AS212635 aka jurrian (on NL-ix, IPv4)"; neighbor 193.239.117.55 as 212635; - ipv4 { preference (PREFPEER-1); }; } - protocol bgp peer6_nlix_jurrian from peer_bgp6 { + protocol bgp peer6_nlix_jurrian from nlix_peer_bgp6 { description "AS212635 aka jurrian (on NL-ix, IPv6)"; neighbor 2001:7f8:13::a521:2635:1 as 212635; - ipv6 { preference (PREFPEER-1); }; } - protocol bgp peer4_nlix_apple from peer_bgp4 { + protocol bgp peer4_nlix_apple from nlix_peer_bgp4 { description "Apple (on NL-ix, IPv4)"; neighbor 193.239.117.113 as 714; - ipv4 { preference (PREFPEER-1); }; } - protocol bgp peer6_nlix_apple from peer_bgp6 { + protocol bgp peer6_nlix_apple from nlix_peer_bgp6 { description "Apple (on NL-ix, IPv6)"; neighbor 2001:7f8:13::a500:714:2 as 714; - ipv6 { preference (PREFPEER-1); }; } protocol bgp ixp4_fogixp_rs1 from ixp_bgp4 {