4 files changed, 1 insertions, 85 deletions
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'] }}";
-}