nixos

commit 5374feccd4ac2f3d366377f370ba6c9d137cf4ea
parent 89ec89e24ac1ec8e764b53031f5b6cf3afc53a2f
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed,  4 Oct 2023 16:05:14 +0200

Use extra table

Diffstat:
M
nixos/worker-1/configuration.nix
 | 
27
++++++++++++---------------
M
nixos/worker-2/configuration.nix
 | 
17
++++++++++-------

2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -444,6 +444,8 @@
       config = ''
         router id 10.100.0.1;
         debug protocols all;
+        ipv4 table backbone;
+        ipv6 table backbone;
 
         function is_valid_network() {
           return net ~ [
@@ -458,21 +460,13 @@
           ];
         }
 
-        protocol device {
-        }
-
-        protocol direct {
-          ipv4;
-          ipv6;
-          interface "floating1";
-        }
-
         protocol kernel {
             scan time 20;
 
             ipv6 {
-                import filter { if is_valid_network_v6()  then accept; else reject; };
-                export all;
+                table backbone;
+                import filter { if is_valid_network_v6() then accept; else reject; };
+                export filter { if is_valid_network_v6() then accept; else reject; };;
             };
         };
 
@@ -480,14 +474,16 @@
             scan time 20;
 
             ipv4 {
-                import filter { if is_valid_network()  then accept; else reject; };
-                export all;
+                table backbone;
+                import filter { if is_valid_network() then accept; else reject; };
+                export filter { if is_valid_network_v6() then accept; else reject; };;
             };
         }
 
         protocol ospf v2 v4 {
           ipv4 {
-            import none;
+            table backbone;
+            import all;
             export all;
           };
           graceful restart 1;
@@ -498,7 +494,8 @@
 
         protocol ospf v3 v6 {
           ipv6 {
-            import none;
+            table backbone;
+            import all;
             export all;
           };
           graceful restart 1;
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -338,6 +338,8 @@
       config = ''
         router id 10.100.0.3;
         debug protocols all;
+        ipv4 table backbone;
+        ipv6 table backbone;
 
         function is_valid_network() {
           return net ~ [
@@ -352,15 +354,13 @@
           ];
         }
 
-        protocol device {
-        }
-
         protocol kernel {
             scan time 20;
 
             ipv6 {
+                table backbone;
                 import filter { if is_valid_network_v6()  then accept; else reject; };
-                export all;
+                export filter { if is_valid_network()  then accept; else reject; };
             };
         };
 
@@ -368,14 +368,16 @@
             scan time 20;
 
             ipv4 {
+                table backbone;
                 import filter { if is_valid_network()  then accept; else reject; };
-                export all;
+                export filter { if is_valid_network()  then accept; else reject; };
             };
         }
 
         protocol ospf v2 v4 {
           ipv4 {
-            import none;
+            table backbone;
+            import all;
             export all;
           };
           graceful restart 1;
@@ -386,7 +388,8 @@
 
         protocol ospf v3 v6 {
           ipv6 {
-            import none;
+            table backbone;
+            import all;
             export all;
           };
           graceful restart 1;