nixos

commit 7638d5e5ac2947212ca7b1a6a7e359bb60f4b8df
parent 4d4b9e8b4c22c4b174a57f97cbd44afea1a92fdb
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed,  4 Oct 2023 16:58:49 +0200

Try again

Diffstat:
M
nixos/worker-1/configuration.nix
 | 
42
+++++++++++++++++++++++-------------------
M
nixos/worker-2/configuration.nix
 | 
10
+++++++++-

2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -442,8 +442,8 @@
     bird2 = {
       enable = true;
       config = ''
-        router id 10.100.0.1;
-        debug protocols all;
+          router id 10.100.0.1;
+          debug protocols all;
 
         function is_valid_network() {
           return net ~ [
@@ -457,36 +457,40 @@
             fe99:13::/64
           ];
         }
-
+      
         protocol device {
-          scan time 10;
+          scan time 10;           # Scan interfaces every 10 seconds
         }
 
-        protocol direct {
-          ipv4;
-          ipv6;
-          interface "floating1";
+        protocol static {
+          ipv4 {
+            import all;
+          };
         }
 
-        protocol kernel {
-          scan time 20;
-
+        protocol static {
           ipv6 {
-            import filter { if is_valid_network_v6() then accept; else reject; };
-            export filter { if is_valid_network_v6() then accept; else reject; };
+            import all;
           };
-        };
+        }
 
         protocol kernel {
-          scan time 20;
+          metric 64;
+          ipv4 {                  # Connect protocol to IPv4 table by channel
+            import filter { if is_valid_network() then accept; else reject; };      # Import to table, default is import all
+            export filter { if is_valid_network() then accept; else reject; };      # Export to protocol. default is export none
+          };
+        }
 
-          ipv4 {
-            import filter { if is_valid_network() then accept; else reject; };
-            export filter { if is_valid_network() then accept; else reject; };
+        protocol kernel {
+          metric 64;
+          ipv6 {                  # Connect protocol to IPv6 table by channel
+            import filter { if is_valid_network_v6() then accept; else reject; };      # Import to table, default is import all
+            export filter { if is_valid_network_v6() then accept; else reject; };      # Export to protocol. default is export none
           };
         }
 
-        protocol ospf v2 v4 {
+        protocol ospf v3 v4 {
           ipv4 {
             import all;
             export all;
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -374,7 +374,15 @@
           };
         }
 
-        protocol ospf v2 v4 {
+        protocol static {
+          ipv4;
+        }
+
+        protocol static {
+          ipv6;
+        }
+
+        protocol ospf v3 v4 {
           ipv4 {
             import all;
             export all;