From 36f713dff28d357458b787e2f1e00a71da7bd51f Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Thu, 13 Jun 2024 20:05:39 +0200
Subject: tnet

---
 tnet/bird-config.yml             | 20 +++++++++++++
 tnet/bird-gen.yml                |  4 +--
 tnet/files/hash/bird-tnet.conf   | 64 ++++++++++++++++++++++++++++++++++++++++
 tnet/files/hash/bird.conf        | 56 -----------------------------------
 tnet/files/knot/bird-tnet.conf   | 57 +++++++++++++++++++++++++++++++++++
 tnet/files/knot/bird.conf        | 49 ------------------------------
 tnet/files/node1/bird-tnet.conf  | 46 +++++++++++++++++++++++++++++
 tnet/files/node1/bird.conf       | 38 ------------------------
 tnet/files/node2/bird-tnet.conf  | 46 +++++++++++++++++++++++++++++
 tnet/files/node2/bird.conf       | 38 ------------------------
 tnet/templates/bird-tnet.conf.j2 | 47 +++++++++++++++++++++++++++++
 tnet/templates/bird.conf.j2      | 39 ------------------------
 12 files changed, 282 insertions(+), 222 deletions(-)
 create mode 100644 tnet/bird-config.yml
 create mode 100644 tnet/files/hash/bird-tnet.conf
 delete mode 100644 tnet/files/hash/bird.conf
 create mode 100644 tnet/files/knot/bird-tnet.conf
 delete mode 100644 tnet/files/knot/bird.conf
 create mode 100644 tnet/files/node1/bird-tnet.conf
 delete mode 100644 tnet/files/node1/bird.conf
 create mode 100644 tnet/files/node2/bird-tnet.conf
 delete mode 100644 tnet/files/node2/bird.conf
 create mode 100644 tnet/templates/bird-tnet.conf.j2
 delete mode 100644 tnet/templates/bird.conf.j2

(limited to 'tnet')

diff --git a/tnet/bird-config.yml b/tnet/bird-config.yml
new file mode 100644
index 0000000..fcffa4d
--- /dev/null
+++ b/tnet/bird-config.yml
@@ -0,0 +1,20 @@
+- hosts: tnet
+  tasks:
+    - become: yes
+      copy:
+        dest: /etc/bird/bird-tnet.conf
+        src: "{{ inventory_hostname }}/bird-tnet.conf"
+      register: bird_conf
+
+    - systemd:
+        state: reloaded
+        service: bird
+      when: bird_conf.changed
+      become: yes
+  handlers:
+    - name: systemctl reload bird
+      become: yes
+      systemd:
+        name: bird
+        state: reloaded
+
diff --git a/tnet/bird-gen.yml b/tnet/bird-gen.yml
index 4a3e19d..17e8128 100644
--- a/tnet/bird-gen.yml
+++ b/tnet/bird-gen.yml
@@ -7,5 +7,5 @@
         path: files/{{ inventory_hostname }}
         state: directory
     - template:
-        src: bird.conf.j2
-        dest: files/{{ inventory_hostname }}/bird.conf
+        src: bird-tnet.conf.j2
+        dest: files/{{ inventory_hostname }}/bird-tnet.conf
diff --git a/tnet/files/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
new file mode 100644
index 0000000..b2afdc8
--- /dev/null
+++ b/tnet/files/hash/bird-tnet.conf
@@ -0,0 +1,64 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
+
+template bgp tnet_tpl {
+  local    as 4242423538;
+  neighbor internal;
+
+  direct;
+
+  password "trygvis";
+
+  ipv6 {
+    next hop self;
+    import filter {
+      if is_tnet() then {
+        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": import reject, reason=not tnet"; reject;
+    };
+    # newer bird's only
+    # import keep filtered;
+    export filter {
+      if is_tnet() then {
+        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": export reject, reason=not tnet"; reject;
+    };
+  };
+}
+
+protocol bgp tnet_astyanax from tnet_tpl {
+  neighbor fe80:a0fd:89e4:42c6:f617:7398:abf4:b517;
+  interface "tnet-astyanax";
+
+  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_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/hash/bird.conf b/tnet/files/hash/bird.conf
deleted file mode 100644
index 16ce2cc..0000000
--- a/tnet/files/hash/bird.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-protocol bgp tnet_astyanax from tnet_tpl {
-  neighbor fe80:a0fd:89e4:42c6:f617:7398:abf4:b517;
-  interface "tnet-astyanax";
-
-  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_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.conf b/tnet/files/knot/bird-tnet.conf
new file mode 100644
index 0000000..32f06cb
--- /dev/null
+++ b/tnet/files/knot/bird-tnet.conf
@@ -0,0 +1,57 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
+
+template bgp tnet_tpl {
+  local    as 4242423538;
+  neighbor internal;
+
+  direct;
+
+  password "trygvis";
+
+  ipv6 {
+    next hop self;
+    import filter {
+      if is_tnet() then {
+        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": import reject, reason=not tnet"; reject;
+    };
+    # newer bird's only
+    # import keep filtered;
+    export filter {
+      if is_tnet() then {
+        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": export reject, reason=not tnet"; reject;
+    };
+  };
+}
+
+protocol bgp tnet_hash from tnet_tpl {
+  neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
+  interface "tnet-hash";
+
+  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;
+}
diff --git a/tnet/files/knot/bird.conf b/tnet/files/knot/bird.conf
deleted file mode 100644
index fcecc19..0000000
--- a/tnet/files/knot/bird.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-protocol bgp tnet_hash from tnet_tpl {
-  neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
-  interface "tnet-hash";
-
-  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;
-}
diff --git a/tnet/files/node1/bird-tnet.conf b/tnet/files/node1/bird-tnet.conf
new file mode 100644
index 0000000..ebf0160
--- /dev/null
+++ b/tnet/files/node1/bird-tnet.conf
@@ -0,0 +1,46 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
+
+template bgp tnet_tpl {
+  local    as 4242423538;
+  neighbor internal;
+
+  direct;
+
+  password "trygvis";
+
+  ipv6 {
+    next hop self;
+    import filter {
+      if is_tnet() then {
+        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": import reject, reason=not tnet"; reject;
+    };
+    # newer bird's only
+    # import keep filtered;
+    export filter {
+      if is_tnet() then {
+        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": export reject, reason=not tnet"; reject;
+    };
+  };
+}
+
+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/node1/bird.conf b/tnet/files/node1/bird.conf
deleted file mode 100644
index 88bd6f8..0000000
--- a/tnet/files/node1/bird.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-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.conf b/tnet/files/node2/bird-tnet.conf
new file mode 100644
index 0000000..813b0f5
--- /dev/null
+++ b/tnet/files/node2/bird-tnet.conf
@@ -0,0 +1,46 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
+
+template bgp tnet_tpl {
+  local    as 4242423538;
+  neighbor internal;
+
+  direct;
+
+  password "trygvis";
+
+  ipv6 {
+    next hop self;
+    import filter {
+      if is_tnet() then {
+        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": import reject, reason=not tnet"; reject;
+    };
+    # newer bird's only
+    # import keep filtered;
+    export filter {
+      if is_tnet() then {
+        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": export reject, reason=not tnet"; reject;
+    };
+  };
+}
+
+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";
+}
diff --git a/tnet/files/node2/bird.conf b/tnet/files/node2/bird.conf
deleted file mode 100644
index 99dfc5e..0000000
--- a/tnet/files/node2/bird.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-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";
-}
diff --git a/tnet/templates/bird-tnet.conf.j2 b/tnet/templates/bird-tnet.conf.j2
new file mode 100644
index 0000000..6e1ba0e
--- /dev/null
+++ b/tnet/templates/bird-tnet.conf.j2
@@ -0,0 +1,47 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
+
+template bgp tnet_tpl {
+  local    as 4242423538;
+  neighbor internal;
+
+  direct;
+
+  password "trygvis";
+
+  ipv6 {
+    next hop self;
+    import filter {
+      if is_tnet() then {
+        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": import reject, reason=not tnet"; reject;
+    };
+    # newer bird's only
+    # import keep filtered;
+    export filter {
+      if is_tnet() then {
+        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
+        accept;
+      }
+      print proto, ": export reject, reason=not tnet"; reject;
+    };
+  };
+}
+{% for p in tnet_bird_peers|default([])|sort %}
+
+protocol bgp tnet_{{ p }} from tnet_tpl {
+  neighbor {{ hostvars[p].tnet_wg[inventory_hostname].address }};
+  interface "tnet-{{ p }}";
+{% if tnet_bird_peers[p].rr_client|default(False) %}
+
+  rr client;
+{% endif %}
+}
+{% endfor %}
diff --git a/tnet/templates/bird.conf.j2 b/tnet/templates/bird.conf.j2
deleted file mode 100644
index 57e557a..0000000
--- a/tnet/templates/bird.conf.j2
+++ /dev/null
@@ -1,39 +0,0 @@
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-{% for p in tnet_bird_peers|default([])|sort %}
-
-protocol bgp tnet_{{ p }} from tnet_tpl {
-  neighbor {{ hostvars[p].tnet_wg[inventory_hostname].address }};
-  interface "tnet-{{ p }}";
-{% if tnet_bird_peers[p].rr_client|default(False) %}
-
-  rr client;
-{% endif %}
-}
-{% endfor %}
-- 
cgit v1.2.3