nixos

commit 61f76d69c97ed0b9746a6d2b81a6ee200c7b58c6
parent afb9ae1fbea50f2d5b4c52925105c1e5ea84db1d
Author: MTRNord <mtrnord1@gmail.com>
Date:   Fri, 27 Oct 2023 22:01:42 +0200

Better naming

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

2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -165,16 +165,16 @@
     nameservers = [ "8.8.8.8" "8.8.4.4" ];
 
     wg-quick.interfaces = {
-      wg0 = {
+      nordgedanken = {
         address = [ "10.100.0.1/24" "fe99:13::1/64" ];
         listenPort = 51820;
         privateKeyFile = config.sops.secrets."wireguard/worker-1/wg0/private_key".path;
         table = "off";
         preUp = ''
-          iptables -t mangle -A FORWARD -o wg0 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o nordgedanken -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
         postUp = ''
-          iptables -t mangle -A FORWARD -o wg0 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o nordgedanken -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
 
         peers = [
@@ -183,23 +183,22 @@
             publicKey = "M+OpQ/umgERHB+K6JJkszVChrRPqqYvMstbr28HRrSE=";
             allowedIPs = [
               "0.0.0.0/0"
-              "::/0"
             ];
             persistentKeepalive = 25;
             endpoint = "95.217.202.35:51821";
           }
         ];
       };
-      wg1 = {
+      worker2 = {
         address = [ "10.100.0.1/24" "fe99:13::1/64" ];
         listenPort = 51821;
         privateKeyFile = config.sops.secrets."wireguard/worker-1/wg1/private_key".path;
         table = "off";
         preUp = ''
-          iptables -t mangle -A FORWARD -o wg1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o worker2 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
         postUp = ''
-          iptables -t mangle -A FORWARD -o wg1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o worker2 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
 
         peers = [
@@ -208,8 +207,8 @@
             publicKey = "bVSjGeOiIO5XXPVkGLrYD4wTV52BFBOLSuCeSD97MUs=";
             allowedIPs = [
               "0.0.0.0/0"
-              "::/0"
             ];
+            persistentKeepalive = 25;
             endpoint = "37.27.5.79:51821";
           }
         ];
@@ -497,7 +496,7 @@
             networks {
               10.100.0.0/24;
             };
-            interface "wg0", "wg1", "floating1" {
+            interface "nordgedanken", "worker2", "floating1" {
               type ptp; # VPN tunnels should be point-to-point
             };
           };
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -157,16 +157,16 @@ in
     nameservers = [ "8.8.8.8" "8.8.4.4" ];
 
     wg-quick.interfaces = {
-      wg0 = {
+      nordgedanken = {
         address = [ "10.100.0.3/24" "fe99:13::3/64" ];
         listenPort = 51820;
         privateKeyFile = config.sops.secrets."wireguard/worker-2/wg0/private_key".path;
         table = "off";
         preUp = ''
-          iptables -t mangle -A FORWARD -o wg0 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o nordgedanken -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
         postUp = ''
-          iptables -t mangle -A FORWARD -o wg0 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o nordgedanken -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
 
         peers = [
@@ -175,23 +175,22 @@ in
             publicKey = "oBqOZGvt83/u8QETTGxRi8wXqXih9IPDl+T5Snqx9yA=";
             allowedIPs = [
               "0.0.0.0/0"
-              "::/0"
             ];
             persistentKeepalive = 25;
             endpoint = "95.217.202.35:51820";
           }
         ];
       };
-      wg1 = {
+      worker1 = {
         address = [ "10.100.0.3/24" "fe99:13::3/64" ];
         listenPort = 51821;
         privateKeyFile = config.sops.secrets."wireguard/worker-2/wg1/private_key".path;
         table = "off";
         preUp = ''
-          iptables -t mangle -A FORWARD -o wg1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o worker1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
         postUp = ''
-          iptables -t mangle -A FORWARD -o wg1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+          iptables -t mangle -A FORWARD -o worker1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
         '';
 
         peers = [
@@ -200,8 +199,8 @@ in
             publicKey = "gVNmams9FSNMrtZYVKEjr04NyEha8I7nxf6GPmdN0FQ=";
             allowedIPs = [
               "0.0.0.0/0"
-              "::/0"
             ];
+            persistentKeepalive = 25;
             endpoint = "49.13.24.105:51821";
           }
         ];
@@ -409,7 +408,7 @@ in
             networks {
               10.100.0.0/24;
             };
-            interface "wg0", "wg1", "floating1" {
+            interface "nordgedanken", "worker1", "floating1" {
               type ptp; # VPN tunnels should be point-to-point
             };
           };