From e2f541ebe247f1b1629f1c7de3b63e14f3f35d73 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Wed, 26 Oct 2022 22:51:21 +0100
Subject: [PATCH] nixos/estuary: Tweak BGP templates

---
 nixos/boxes/colony/vms/estuary/bgp.nix | 29 ++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/nixos/boxes/colony/vms/estuary/bgp.nix b/nixos/boxes/colony/vms/estuary/bgp.nix
index 688fc4a..3309423 100644
--- a/nixos/boxes/colony/vms/estuary/bgp.nix
+++ b/nixos/boxes/colony/vms/estuary/bgp.nix
@@ -116,6 +116,13 @@ in
           template bgp peer_bgp4 from base_bgp4 {
             ipv4 {
               import filter bgp_import;
+              preference PREFPEER;
+            };
+          }
+          template bgp ixp_bgp4 from base_bgp4 {
+            ipv4 {
+              import filter bgp_import;
+              preference PREFIXP;
             };
           }
 
@@ -138,6 +145,13 @@ in
           template bgp peer_bgp6 from base_bgp6 {
             ipv6 {
               import filter bgp_import;
+              preference PREFPEER;
+            };
+          }
+          template bgp ixp_bgp6 from base_bgp6 {
+            ipv6 {
+              import filter bgp_import;
+              preference PREFIXP;
             };
           }
 
@@ -159,43 +173,36 @@ in
             neighbor 2a02:898:0:20::e1 as 8283;
           }
 
-          protocol bgp peer4_frysix_rs1 from peer_bgp4 {
+          protocol bgp ixp4_frysix_rs1 from ixp_bgp4 {
             description "Frys-IX route server 1 (IPv4)";
             neighbor 185.1.203.253 as 56393;
-            ipv4 { preference PREFIXP; };
           }
-          protocol bgp peer6_frysix_rs1 from peer_bgp6 {
+          protocol bgp ixp6_frysix_rs1 from ixp_bgp6 {
             description "Frys-IX route server 1 (IPv6)";
             neighbor 2001:7f8:10f::dc49:253 as 56393;
-            ipv6 { preference PREFIXP; };
           }
 
-          protocol bgp peer4_frysix_rs2 from peer_bgp4 {
+          protocol bgp ixp4_frysix_rs2 from ixp_bgp4 {
             description "Frys-IX route server 2 (IPv4)";
             neighbor 185.1.203.254 as 56393;
-            ipv4 { preference PREFIXP; };
           }
-          protocol bgp peer6_frysix_rs2 from peer_bgp6 {
+          protocol bgp ixp6_frysix_rs2 from ixp_bgp6 {
             description "Frys-IX route server 2 (IPv6)";
             neighbor 2001:7f8:10f::dc49:254 as 56393;
-            ipv6 { preference PREFIXP; };
           }
 
           protocol bgp peer4_luje from peer_bgp4 {
             description "LUJE.net (IPv4)";
             neighbor 94.142.240.20 as 212855;
-            ipv4 { preference PREFPEER; };
           }
           protocol bgp peer6_luje from peer_bgp6 {
             description "LUJE.net (IPv6)";
             neighbor 2a02:898:0:20::166:1 as 212855;
-            ipv6 { preference PREFPEER; };
           }
           protocol bgp peer6_luje_labs from peer_bgp6 {
             description "LUJE.net labs (IPv6)";
             multihop 3;
             neighbor 2a07:cd40:1::9 as 202413;
-            ipv6 { preference PREFPEER; };
           }
         '';
       };