tnet: Using templates instead of files

2 files changed, 0 insertions, 68 deletions

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";
-}