nixos

commit 4de9a3af84dd6629d7d2662da29271c0a4b0d509
parent 2bd74c275e47191fee27536d7d667880884c4cc1
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed,  4 Oct 2023 13:05:18 +0200

Fix mess

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

2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -178,17 +178,11 @@
             allowedIPs = [
               "10.100.12.1/24"
               "10.100.0.2/24"
-              "10.100.0.202/24"
               "fe99:13::2/64"
-              "fe99:13::202/64"
               "10.100.0.1/24"
-              "10.100.0.201/24"
               "fe99:13::1/64"
-              "fe99:13::201/64"
               "10.100.0.3/24"
-              "10.100.0.203/24"
               "fe99:13::3/64"
-              "fe99:13::203/64"
             ];
             persistentKeepalive = 25;
             endpoint = "95.217.202.35:51821";
@@ -196,7 +190,7 @@
         ];
       };
       wg1 = {
-        address = [ "10.100.0.201/24" "fe99:13::201/64" ];
+        address = [ "10.100.0.1/24" "fe99:13::1/64" ];
         listenPort = 51821;
         privateKeyFile = config.sops.secrets."wireguard/private_key".path;
         table = "off";
@@ -208,17 +202,11 @@
             allowedIPs = [
               "10.100.12.1/24"
               "10.100.0.2/24"
-              "10.100.0.202/24"
               "fe99:13::2/64"
-              "fe99:13::202/64"
               "10.100.0.1/24"
-              "10.100.0.201/24"
               "fe99:13::1/64"
-              "fe99:13::201/64"
               "10.100.0.3/24"
-              "10.100.0.203/24"
               "fe99:13::3/64"
-              "fe99:13::203/64"
             ];
             endpoint = "37.27.5.79:51821";
           }
@@ -513,8 +501,8 @@
     bird-lg = {
       proxy = {
         enable = true;
-        allowedIPs = [ "100.64.0.1" ];
-        listenAddress = "100.64.0.1:8000";
+        allowedIPs = [ "10.100.0.1" "fe99:13::1" ];
+        listenAddress = "10.100.0.1:8000";
       };
       frontend = {
         enable = true;
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -151,17 +151,11 @@
             allowedIPs = [
               "10.100.12.1/24"
               "10.100.0.2/24"
-              "10.100.0.202/24"
               "fe99:13::2/64"
-              "fe99:13::202/64"
               "10.100.0.1/24"
-              "10.100.0.201/24"
               "fe99:13::1/64"
-              "fe99:13::201/64"
               "10.100.0.3/24"
-              "10.100.0.203/24"
               "fe99:13::3/64"
-              "fe99:13::203/64"
             ];
             persistentKeepalive = 25;
             endpoint = "95.217.202.35:51820";
@@ -169,7 +163,7 @@
         ];
       };
       wg1 = {
-        address = [ "10.100.0.203/24" "fe99:13::203/64" ];
+        address = [ "10.100.0.3/24" "fe99:13::3/64" ];
         listenPort = 51821;
         privateKeyFile = config.sops.secrets."wireguard/worker-2/private_key".path;
         table = "off";
@@ -181,17 +175,11 @@
             allowedIPs = [
               "10.100.12.1/24"
               "10.100.0.2/24"
-              "10.100.0.202/24"
               "fe99:13::2/64"
-              "fe99:13::202/64"
               "10.100.0.1/24"
-              "10.100.0.201/24"
               "fe99:13::1/64"
-              "fe99:13::201/64"
               "10.100.0.3/24"
-              "10.100.0.203/24"
               "fe99:13::3/64"
-              "fe99:13::203/64"
             ];
             endpoint = "49.13.24.105:51821";
           }