tnet: Removing lhn2pi

11 files changed, 9 insertions, 110 deletions

diff --git a/tnet/group_vars/all/bird.sops.yml b/tnet/group_vars/all/bird.sops.yml
index 334634f..c87f3c4 100644
--- a/tnet/group_vars/all/bird.sops.yml
+++ b/tnet/group_vars/all/bird.sops.yml
@@ -3,7 +3,6 @@ bgp_password:
     coregonus-knot: ENC[AES256_GCM,data:WgO2B0FQVQ==,iv:zhaCbX6M7fMMHr63KgIrOcpnI9dmPJLTOlXJVqYkFb0=,tag:Y2H+RjuPGBMUFJJFEeL5Yw==,type:str]
     hash-knot: ENC[AES256_GCM,data:SI2yYLIepg==,iv:Icky8rMsLQj77zu5vdqCZBWoHiYlNbIwlAvD5m+DH7A=,tag:9PImx9SXYuusNhZeWVPV7g==,type:str]
     knot-kv24ix: ENC[AES256_GCM,data:z7SG+zuQ7g==,iv:APPjOs+MH9c0xfxmGEMoAQq00i847jGdbpoSkgwbpY0=,tag:jkgb7PlAF/kb50+i+3WEGw==,type:str]
-    knot-lhn2pi: ENC[AES256_GCM,data:k/pQyjnQyA==,iv:oW9t8Pruu/k/qIG6uG8Ex61QHerYhU09Ns0AI8NKkJA=,tag:H0A4jr/hBcGTuKeNV2zB1Q==,type:str]
     knot-node1: ENC[AES256_GCM,data:rY0x5yu9zw==,iv:TyyhW1IwtkcU2q2y6ACgEqNEqMJ64PyMQ/kkkyCJB8E=,tag:fepqIEhEbrNFUr9f1iOMAQ==,type:str]
     knot-node2: ENC[AES256_GCM,data:EE/JkIj23g==,iv:Gv1kd+lOFPir3z0TTlRdeOMffCQreBA5HiCHHwOUu+M=,tag:hwmABQCkbvQ6kSVchUZ6+g==,type:str]
 sops:
@@ -39,8 +38,8 @@ sops:
             VzVzNmtJampuZ2tKQnU3Y3FTZFFhdkUKej0Hy9kOYDqg+8B+slMdGE2Krcvqr4uJ
             X7GxDCdLV7sllK6OlHe2aQkXb16oT0iGG7N61LCzWBDOfx0hzdyFPA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-19T18:22:33Z"
-    mac: ENC[AES256_GCM,data:Gm09oBu15JksqrK3H1TabhshiOShqwZLYFon6aqd8MmNQU0ufItZARU2K32Gu09dmDerE5Kbrq5u5U4fJXDkFRVYcFktIlD5FcCN2DlG7pB9rbpMZEHUt89wMAX6uvFat+66PUbE56Cio3Hlv88sB98VIKSratK2E0mlFB0oqYY=,iv:QaG4djyDGv+bpSz3+q6BTWAZyuUtNSkdG79/HciQlVE=,tag:TZ/qUmvWadnHYW/B00oEmQ==,type:str]
+    lastmodified: "2025-12-28T08:18:39Z"
+    mac: ENC[AES256_GCM,data:imlEN3/KxgOfZ8PKJHE6V6+1eMIVAZCTuGPMkocTgEqoKacpUbP6ap4lT3tm5I/YdeSJuRSYV3z89PPmkXXa31+c57RFewgX0bpvMYijEzI780xN4TXybETRqOKhUtv01RgAo2nZvmtVl7xi4tvr1NC22Af1ZzeheFI5rZt30vo=,iv:Zq7S3H+aBu1iuNdMw4AkvnjDh0spJJ3jLuJ0NVE3s5I=,tag:ClHvPDrAFfYNrppouOJJSw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.1
diff --git a/tnet/host_vars/hash/bird.yml b/tnet/host_vars/hash/bird.yml
index 2b4bb51..663f8e1 100644
--- a/tnet/host_vars/hash/bird.yml
+++ b/tnet/host_vars/hash/bird.yml
@@ -4,8 +4,6 @@ tnet_bird_peers:
     interface: tnet-confltrio
   knot:
     rr_client: true
-  lhn2pi:
-    rr_client: true
   node1:
     rr_client: true
   node2:
diff --git a/tnet/host_vars/hash/wg.yml b/tnet/host_vars/hash/wg.yml
index 5754f57..31707c9 100644
--- a/tnet/host_vars/hash/wg.yml
+++ b/tnet/host_vars/hash/wg.yml
@@ -7,9 +7,9 @@ tnet_wg:
   akili:
     port: 51002
     address: fdb1:4242:3538:ffff:ca85:f812:3935:5fba
-  lhn2pi:
-    port: 51003
-    address: fe80:6195:1d43:9655:35f7:9dba:798c:26b8
+#  lhn2pi:
+#    port: 51003
+#    address: fe80:6195:1d43:9655:35f7:9dba:798c:26b8
   astyanax:
     port: 51004
     address: fe80:a0fd:89e4:42c6:f617:7398:abf4:b516
diff --git a/tnet/host_vars/knot/bird.yml b/tnet/host_vars/knot/bird.yml
index 94c610a..107df4c 100644
--- a/tnet/host_vars/knot/bird.yml
+++ b/tnet/host_vars/knot/bird.yml
@@ -12,8 +12,6 @@ tnet_bird_peers:
     rr_client: true
   node2:
     rr_client: true
-  lhn2pi:
-    rr_client: true
   routedbits_lon1:
     policy: dn42
     as: 4242420207
diff --git a/tnet/host_vars/knot/wg.yml b/tnet/host_vars/knot/wg.yml
index e64a4a6..fa91acb 100644
--- a/tnet/host_vars/knot/wg.yml
+++ b/tnet/host_vars/knot/wg.yml
@@ -14,9 +14,9 @@ tnet_wg:
   akili:
     port: 51004
     address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
-  lhn2pi:
-    port: 51005
-    address: fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8
+#  lhn2pi:
+#    port: 51005
+#    address: fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8
   astyanax:
     port: 51006
     address: fe80:6728:53fc:fc81:40b3:9beb:8336:ba56
diff --git a/tnet/host_vars/lhn2pi/bird.yml b/tnet/host_vars/lhn2pi/bird.yml
deleted file mode 100644
index 564c993..0000000
--- a/tnet/host_vars/lhn2pi/bird.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tnet_bird_peers:
-  hash:
-  knot:
-
-birdv: 2008
diff --git a/tnet/host_vars/lhn2pi/wg.yml b/tnet/host_vars/lhn2pi/wg.yml
deleted file mode 100644
index c94745c..0000000
--- a/tnet/host_vars/lhn2pi/wg.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-tnet_wg:
-  knot:
-    endpoint: knot.inamo.no:51005
-    address: fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9
-  hash:
-    endpoint: hash.trygvis.io:51003
-    address: fe80:6195:1d43:9655:35f7:9dba:798c:26b9
diff --git a/tnet/templates/hash/bird-tnet.conf b/tnet/templates/hash/bird-tnet.conf
index d9c52b0..9a0eed0 100644
--- a/tnet/templates/hash/bird-tnet.conf
+++ b/tnet/templates/hash/bird-tnet.conf
@@ -51,14 +51,6 @@ protocol bgp tnet_knot from tnet_tpl {
   rr client;
 }
 
-protocol bgp tnet_lhn2pi from tnet_tpl {
-  neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b9;
-  interface "tnet-lhn2pi";
-  password "{{ bgp_password['hash-lhn2pi'] }}";
-
-  rr client;
-}
-
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
   interface "tnet-node1";
diff --git a/tnet/templates/knot/bird-tnet.conf b/tnet/templates/knot/bird-tnet.conf
index 699c0f2..2cbbb75 100644
--- a/tnet/templates/knot/bird-tnet.conf
+++ b/tnet/templates/knot/bird-tnet.conf
@@ -60,21 +60,13 @@ protocol bgp tnet_hash from tnet_tpl {
 }
 
 protocol bgp tnet_kv24ix from tnet_tpl {
-  neighbor fe80:fef1:078a:5b64:efd3:ae7b:d286:d7cf;
+  neighbor fdb1:4242:3538:2f02::b/64;
   interface "tnet-kv24ix";
   password "{{ bgp_password['knot-kv24ix'] }}";
 
   rr client;
 }
 
-protocol bgp tnet_lhn2pi from tnet_tpl {
-  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9;
-  interface "tnet-lhn2pi";
-  password "{{ bgp_password['knot-lhn2pi'] }}";
-
-  rr client;
-}
-
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f3;
   interface "tnet-node1";
diff --git a/tnet/templates/lhn2pi/bird-tnet-pre.conf b/tnet/templates/lhn2pi/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/templates/lhn2pi/bird-tnet-pre.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-define tnet = fdb1:4242:3538:2000::/52;
-
-function is_tnet()
-{
-  return net ~ tnet;
-}
-
-roa6 table dn42_roa;
-
-protocol static {
-    roa6 { table dn42_roa; };
-    include "/etc/bird/dn42_roa_bird2_6.conf";
-};
-
-function dn42_is_valid_network()
-{
-  return net ~ [
-    fd00::/8{44,64} # ULA address space as per RFC 4193
-  ];
-}
diff --git a/tnet/templates/lhn2pi/bird-tnet.conf b/tnet/templates/lhn2pi/bird-tnet.conf
deleted file mode 100644
index f755c3b..0000000
--- a/tnet/templates/lhn2pi/bird-tnet.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Set to true if this peer is directly connected to a dn42 peer
-define is_dn42_peer = true;
-# If we are connected directly to dn42, we don't want the dn42 routes from others
-define import_dn42 = !is_dn42_peer;
-define export_dn42 = is_dn42_peer;
-
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw;
-      } else if import_dn42 && dn42_is_valid_network() then {
-        accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
-      } else {
-        reject proto, ": import reject, reason=not tnet";
-      }
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw;
-      } else if export_dn42 && dn42_is_valid_network() then {
-        accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw;
-      } else {
-        reject proto, ": export reject, reason=not tnet";
-      }
-    };
-  };
-}
-
-protocol bgp tnet_hash from tnet_tpl {
-  neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b8;
-  interface "tnet-hash";
-  password "{{ bgp_password['hash-lhn2pi'] }}";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8;
-  interface "tnet-knot";
-  password "{{ bgp_password['knot-lhn2pi'] }}";
-}