nixos

commit 046c31bcc48779743c8380781b09b9e07f7a4b46
parent 853db770748c4c283246ee147a74b14e1e5f65b4
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 27 Jan 2024 23:54:33 +0100

gre

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

2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -146,19 +146,19 @@ in {
     };
     networks = {
       gre_nordgedanken = {
+        address = [
+          "10.0.3.4/24"
+        ];
         matchConfig = {
           Name = "gre_nordgedanken";
-          address = [
-            "10.0.3.4/24"
-          ];
         };
       };
       gre_worker2 = {
+        address = [
+          "10.0.3.4/24"
+        ];
         matchConfig = {
           Name = "gre_worker2";
-          address = [
-            "10.0.3.4/24"
-          ];
         };
       };
       floating1 = {
@@ -169,12 +169,17 @@ in {
           Name = "floating1";
         };
       };
-      "20-v6" = {
+      "vlan" = {
         tunnel = [
           "gre_nordgedanken"
           "gre_worker2"
         ];
         matchConfig = {
+          Name = "enp7s0";
+        };
+      };
+      "20-v6" = {
+        matchConfig = {
           MACAddress = "96:00:02:44:cf:52";
         };
         address = [
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -133,33 +133,38 @@ in {
     };
     networks = {
       gre_nordgedanken = {
+        address = [
+          "10.0.3.3/24"
+        ];
         matchConfig = {
           Name = "gre_nordgedanken";
-          address = [
-            "10.0.3.3/24"
-          ];
         };
       };
       gre_worker1 = {
+        address = [
+          "10.0.3.3/24"
+        ];
         matchConfig = {
           Name = "gre_worker1";
-          address = [
-            "10.0.3.3/24"
-          ];
         };
       };
-      "20-v6" = {
+      "vlan" = {
         tunnel = [
           "gre_nordgedanken"
           "gre_worker1"
         ];
         matchConfig = {
-          MACAddress = "96:00:02:97:a7:51";
+          Name = "enp7s0";
         };
+      };
+      "20-v6" = {
         address = [
           "37.27.5.79/32"
           "2a01:4f9:c012:54d3::/64"
         ];
+        matchConfig = {
+          MACAddress = "96:00:02:97:a7:51";
+        };
         routes = [
           {routeConfig.Gateway = "fe80::1";}
           {