nixos

commit 502b860f0a51b50b22196f29d6ec113a9a436afe
parent 7ba6762b21c04168bb10ea56ffd22142590b3690
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed,  4 Oct 2023 16:19:37 +0200

Add proto direct for floating stuff and friends to land in the right table

Diffstat:
M
nixos/worker-1/configuration.nix
 | 
39
+++++++++++++++++++++++++++------------
M
nixos/worker-2/configuration.nix
 | 
37
+++++++++++++++++++++++++------------

2 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -460,24 +460,39 @@
           ];
         }
 
+
+        protocol direct {
+          ipv4 {
+            table backbone;
+            import filter { if is_valid_network() then accept; else reject; };
+            export filter { if is_valid_network() then accept; else reject; };
+          };
+          ipv6 {
+            table backbone6;
+            import filter { if is_valid_network_v6() then accept; else reject; };
+            export filter { if is_valid_network_v6() then accept; else reject; };
+          };
+          interface "wg0", "wg1", "floating1";
+        }
+
         protocol kernel {
-            scan time 20;
+          scan time 20;
 
-            ipv6 {
-                table backbone6;
-                import filter { if is_valid_network_v6() then accept; else reject; };
-                export filter { if is_valid_network_v6() then accept; else reject; };
-            };
+          ipv6 {
+            table backbone6;
+            import filter { if is_valid_network_v6() then accept; else reject; };
+            export filter { if is_valid_network_v6() then accept; else reject; };
+          };
         };
 
         protocol kernel {
-            scan time 20;
+          scan time 20;
 
-            ipv4 {
-                table backbone;
-                import filter { if is_valid_network() then accept; else reject; };
-                export filter { if is_valid_network() then accept; else reject; };
-            };
+          ipv4 {
+            table backbone;
+            import filter { if is_valid_network() then accept; else reject; };
+            export filter { if is_valid_network() then accept; else reject; };
+          };
         }
 
         protocol ospf v2 v4 {
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -353,25 +353,38 @@
             fe99:13::/64
           ];
         }
+        protocol direct {
+          ipv4 {
+            table backbone;
+            import filter { if is_valid_network() then accept; else reject; };
+            export filter { if is_valid_network() then accept; else reject; };
+          };
+          ipv6 {
+            table backbone6;
+            import filter { if is_valid_network_v6() then accept; else reject; };
+            export filter { if is_valid_network_v6() then accept; else reject; };
+          };
+          interface "wg0", "wg1";
+        }
 
         protocol kernel {
-            scan time 20;
+          scan time 20;
 
-            ipv6 {
-                table backbone6;
-                import filter { if is_valid_network_v6()  then accept; else reject; };
-                export filter { if is_valid_network_v6()  then accept; else reject; };
-            };
+          ipv6 {
+            table backbone6;
+            import filter { if is_valid_network_v6()  then accept; else reject; };
+            export filter { if is_valid_network_v6()  then accept; else reject; };
+          };
         };
 
         protocol kernel {
-            scan time 20;
+          scan time 20;
 
-            ipv4 {
-                table backbone;
-                import filter { if is_valid_network()  then accept; else reject; };
-                export filter { if is_valid_network()  then accept; else reject; };
-            };
+          ipv4 {
+            table backbone;
+            import filter { if is_valid_network()  then accept; else reject; };
+            export filter { if is_valid_network()  then accept; else reject; };
+          };
         }
 
         protocol ospf v2 v4 {