nixos

commit 89ec89e24ac1ec8e764b53031f5b6cf3afc53a2f
parent 0e6b24b6ce526939a4d72c8468712d6045f55916
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed,  4 Oct 2023 15:53:05 +0200

Furether ospf changes

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

2 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -459,8 +459,6 @@
         }
 
         protocol device {
-          scan time 10;
-          interface "wg0", "wg1", "floating1";
         }
 
         protocol direct {
@@ -474,11 +472,7 @@
 
             ipv6 {
                 import filter { if is_valid_network_v6()  then accept; else reject; };
-                export filter {
-                    if source = RTS_STATIC then reject;
-                    krt_prefsrc = fe99:13::1;
-                    accept;
-                };
+                export all;
             };
         };
 
@@ -487,45 +481,29 @@
 
             ipv4 {
                 import filter { if is_valid_network()  then accept; else reject; };
-                export filter {
-                    if source = RTS_STATIC then reject;
-                    krt_prefsrc = 10.100.0.1;
-                    accept;
-                };
+                export all;
             };
         }
 
         protocol ospf v2 v4 {
           ipv4 {
-            import filter {
-              if is_valid_network() then {
-                accept;
-              } else reject;
-            };
-            export filter { if is_valid_network() && source ~ [RTS_STATIC, RTS_OSPF] then accept; else reject; };
+            import none;
+            export all;
           };
           graceful restart 1;
           area 0.0.0.0 {
-            interface "wg0", "wg1" {
-              type ptmp;
-            };
+            interface "wg0", "wg1";
           };
         }
 
         protocol ospf v3 v6 {
           ipv6 {
-            import filter {
-              if is_valid_network_v6() then {
-                accept;
-              } else reject;
-            };
-            export filter { if is_valid_network_v6() && source ~ [RTS_STATIC, RTS_OSPF] then accept; else reject; };
+            import none;
+            export all;
           };
           graceful restart 1;
           area 0.0.0.0 {
-            interface "wg0", "wg1" {
-              type ptmp;
-            };
+            interface "wg0", "wg1";
           };
         }
       '';
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -353,8 +353,6 @@
         }
 
         protocol device {
-          scan time 10;
-          interface "wg0", "wg1";
         }
 
         protocol kernel {
@@ -362,11 +360,7 @@
 
             ipv6 {
                 import filter { if is_valid_network_v6()  then accept; else reject; };
-                export filter {
-                    if source = RTS_STATIC then reject;
-                    krt_prefsrc = fe99:13::3;
-                    accept;
-                };
+                export all;
             };
         };
 
@@ -375,45 +369,29 @@
 
             ipv4 {
                 import filter { if is_valid_network()  then accept; else reject; };
-                export filter {
-                    if source = RTS_STATIC then reject;
-                    krt_prefsrc = 10.100.0.3;
-                    accept;
-                };
+                export all;
             };
         }
 
         protocol ospf v2 v4 {
           ipv4 {
-            import filter {
-              if is_valid_network() then {
-                accept;
-              } else reject;
-            };
-            export filter { if is_valid_network() && source ~ [RTS_STATIC, RTS_OSPF] then accept; else reject; };
+            import none;
+            export all;
           };
           graceful restart 1;
           area 0.0.0.0 {
-            interface "wg0", "wg1" {
-              type ptmp;
-            };
+            interface "wg0", "wg1";
           };
         }
 
         protocol ospf v3 v6 {
           ipv6 {
-            import filter {
-              if is_valid_network_v6() then {
-                accept;
-              } else reject;
-            };
-            export filter { if is_valid_network_v6() && source ~ [RTS_STATIC, RTS_OSPF] then accept; else reject; };
+            import none;
+            export all;
           };
           graceful restart 1;
           area 0.0.0.0 {
-            interface "wg0", "wg1" {
-              type ptmp;
-            };
+            interface "wg0", "wg1";
           };
         }
       '';