nixos

commit 3135a8cd464e2b0b7164aefd0e2eedb8803469ab
parent 2d0a2b95881705c32acd44ef8b12a011774e4af2
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 27 Jan 2024 22:44:28 +0100

defeated

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

2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -449,10 +449,6 @@ in {
         ## Boilerplate from distro
         log syslog all;
 
-        protocol static {
-          ipv4;
-        }
-
         protocol direct direct2 {
           ipv4;
           interface "enp7s0";
@@ -460,7 +456,7 @@ in {
 
         protocol device {
           scan time 10;
-          interface "floating1";
+          interface "enp7s0", "floating1";
         }
 
         protocol kernel {
@@ -471,6 +467,7 @@ in {
             };
             import all;
           };
+          learn yes;
         }
 
         protocol babel {
@@ -478,10 +475,12 @@ in {
             type wired;
           };
           ipv4 {
-            export where (source = RTS_DEVICE) || (source = RTS_BABEL);
+            import all;
+            export all;
           };
           ipv6 {
-            export where (source = RTS_DEVICE) || (source = RTS_BABEL);
+            import all;
+            export all;
           };
         }
       '';
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -660,10 +660,6 @@ in {
         ## Boilerplate from distro
         log syslog all;
 
-        protocol static {
-          ipv4;
-        }
-
         protocol direct direct2 {
           ipv4;
           interface "enp7s0";
@@ -677,16 +673,19 @@ in {
             };
             import all;
           };
+          learn yes;
         }
         protocol babel {
           interface "enp7s0" {
             type wired;
           };
           ipv4 {
-            export where (source = RTS_DEVICE) || (source = RTS_BABEL);
+            import all;
+            export all;
           };
           ipv6 {
-            export where (source = RTS_DEVICE) || (source = RTS_BABEL);
+            import all;
+            export all;
           };
         }
       '';