tnet: Using templates instead of files

18 files changed, 0 insertions, 700 deletions

diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/akili/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/files/akili/bird-tnet.conf b/tnet/files/akili/bird-tnet.conf
deleted file mode 100644
index 24c9b8e..0000000
--- a/tnet/files/akili/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;
-
-  password "trygvis";
-
-  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 fdb1:4242:3538:ffff:ca85:f812:3935:5fba;
-  interface "tnet-hash";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/files/astyanax/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/astyanax/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/files/astyanax/bird-tnet.conf b/tnet/files/astyanax/bird-tnet.conf
deleted file mode 100644
index 3dbf4c9..0000000
--- a/tnet/files/astyanax/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;
-
-  password "trygvis";
-
-  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:a0fd:89e4:42c6:f617:7398:abf4:b516;
-  interface "tnet-hash";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:6728:53fc:fc81:40b3:9beb:8336:ba56;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/conflatorio/bird-tnet-pre.conf b/tnet/files/conflatorio/bird-tnet-pre.conf
deleted file mode 100644
index d60e8df..0000000
--- a/tnet/files/conflatorio/bird-tnet-pre.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-define tnet = fdb1:4242:3538:2000::/52;
-
-function is_tnet() -> bool
-{
-  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() -> bool
-{
-  return net ~ [
-    fd00::/8{44,64} # ULA address space as per RFC 4193
-  ];
-}
diff --git a/tnet/files/conflatorio/bird-tnet.conf b/tnet/files/conflatorio/bird-tnet.conf
deleted file mode 100644
index 02780a6..0000000
--- a/tnet/files/conflatorio/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;
-
-  password "trygvis";
-
-  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:4540:476c:d432:2f32:818b:811b:bb61;
-  interface "tnet-hash";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:47fc:0660:b91f:1063:a6ae:46bb:7589;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/coregonus/bird-tnet-pre.conf b/tnet/files/coregonus/bird-tnet-pre.conf
deleted file mode 100644
index d60e8df..0000000
--- a/tnet/files/coregonus/bird-tnet-pre.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-define tnet = fdb1:4242:3538:2000::/52;
-
-function is_tnet() -> bool
-{
-  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() -> bool
-{
-  return net ~ [
-    fd00::/8{44,64} # ULA address space as per RFC 4193
-  ];
-}
diff --git a/tnet/files/coregonus/bird-tnet.conf b/tnet/files/coregonus/bird-tnet.conf
deleted file mode 100644
index 95ede41..0000000
--- a/tnet/files/coregonus/bird-tnet.conf
+++ /dev/null
@@ -1,43 +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;
-
-  password "trygvis";
-
-  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_knot from tnet_tpl {
-  neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d2;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/hash/bird-tnet-pre.conf b/tnet/files/hash/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/hash/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/files/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
deleted file mode 100644
index a570291..0000000
--- a/tnet/files/hash/bird-tnet.conf
+++ /dev/null
@@ -1,73 +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;
-
-  password "trygvis";
-
-  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_conflatorio from tnet_tpl {
-  neighbor fe80:4540:476c:d432:2f32:818b:811b:bb60;
-  interface "tnet-confltrio";
-
-  rr client;
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7c;
-  interface "tnet-knot";
-
-  rr client;
-}
-
-protocol bgp tnet_lhn2pi from tnet_tpl {
-  neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b9;
-  interface "tnet-lhn2pi";
-
-  rr client;
-}
-
-protocol bgp tnet_node1 from tnet_tpl {
-  neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
-  interface "tnet-node1";
-
-  rr client;
-}
-
-protocol bgp tnet_node2 from tnet_tpl {
-  neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8d;
-  interface "tnet-node2";
-
-  rr client;
-}
diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf
deleted file mode 100644
index d60e8df..0000000
--- a/tnet/files/knot/bird-tnet-pre.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-define tnet = fdb1:4242:3538:2000::/52;
-
-function is_tnet() -> bool
-{
-  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() -> bool
-{
-  return net ~ [
-    fd00::/8{44,64} # ULA address space as per RFC 4193
-  ];
-}
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf
deleted file mode 100644
index f21be09..0000000
--- a/tnet/files/knot/bird-tnet.conf
+++ /dev/null
@@ -1,116 +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;
-
-  password "trygvis";
-
-  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_conflatorio from tnet_tpl {
-  neighbor fe80:47fc:660:b91f:1063:a6ae:46bb:7588;
-  interface "tnet-confltrio";
-
-  rr client;
-}
-
-protocol bgp tnet_coregonus from tnet_tpl {
-  neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d3;
-  interface "tnet-coregonus";
-
-  rr client;
-}
-
-protocol bgp tnet_hash from tnet_tpl {
-  neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
-  interface "tnet-hash";
-
-  rr client;
-}
-
-protocol bgp tnet_kv24ix from tnet_tpl {
-  neighbor fe80:fef1:078a:5b64:efd3:ae7b:d286:d7cf;
-  interface "tnet-kv24ix";
-
-  rr client;
-}
-
-protocol bgp tnet_lhn2pi from tnet_tpl {
-  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9;
-  interface "tnet-lhn2pi";
-
-  rr client;
-}
-
-protocol bgp tnet_node1 from tnet_tpl {
-  neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f3;
-  interface "tnet-node1";
-
-  rr client;
-}
-
-protocol bgp tnet_node2 from tnet_tpl {
-  neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32db;
-  interface "tnet-node2";
-
-  rr client;
-}
-
-protocol bgp routedbits_lon1 {
-  local    as 4242423538;
-  neighbor fe80::207;
-  neighbor as 4242420207;
-  interface "tnet-rtdbts_l1";
-
-  ipv6 {
-    import filter {
-      if dn42_is_valid_network() && (net !~ tnet) then {
-        # Check when unknown or invalid according to ROA
-        if (roa_check(dn42_roa, net, bgp_path.last) = ROA_VALID) then {
-          accept;
-        } else {
-          reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;
-        }
-      } else {
-        reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last;
-      }
-    };
-    export filter {
-      if net ~ tnet then {
-        accept proto, "[dn42] accepting export tnet: ", net;
-      } else {
-        reject proto, "[dn42] rejecting export: ", net;
-      }
-    };
-  };
-}
diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/files/lhn2pi/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/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/files/lhn2pi/bird-tnet.conf b/tnet/files/lhn2pi/bird-tnet.conf
deleted file mode 100644
index 9f0ef8c..0000000
--- a/tnet/files/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;
-
-  password "trygvis";
-
-  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";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/files/node1/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/node1/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/files/node1/bird-tnet.conf b/tnet/files/node1/bird-tnet.conf
deleted file mode 100644
index 6449582..0000000
--- a/tnet/files/node1/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;
-
-  password "trygvis";
-
-  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:a026:6ec2:b356:21c5:b51:22b9:a1de;
-  interface "tnet-hash";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f2;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/files/node2/bird-tnet-pre.conf
deleted file mode 100644
index 74c981d..0000000
--- a/tnet/files/node2/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/files/node2/bird-tnet.conf b/tnet/files/node2/bird-tnet.conf
deleted file mode 100644
index b9a2294..0000000
--- a/tnet/files/node2/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;
-
-  password "trygvis";
-
-  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:a7a6:c1a8:c261:232e:7d67:fc27:7c8c;
-  interface "tnet-hash";
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32da;
-  interface "tnet-knot";
-}