greatly simplify ipv4 and ipv6 configuration

10 files changed, 15 insertions, 26 deletions

diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts
index 0cb04f2..d721c27 100644
--- a/cluster/staging/known_hosts
+++ b/cluster/staging/known_hosts
@@ -9,3 +9,4 @@ piranha.polyno.me,2a01:cb05:8984:3c00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1
 2a01:e0a:5e4:1d0:223:24ff:feaf:fdec ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK
 df-pw5.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeehxeGiZR7qquYGoqEH/YrRJ/ukEcaLH
 10.14.3.1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co
+192.168.1.22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
index e1bd3a6..5822f49 100644
--- a/cluster/staging/node/carcajou.nix
+++ b/cluster/staging/node/carcajou.nix
@@ -8,6 +8,12 @@
       ./remote-unlock.nix
     ];
 
+  deuxfleurs.remoteUnlock = {
+    networkInterface = "eno1";
+    staticIP = "192.168.1.22/24";
+    defaultGateway = "192.168.1.1";
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = 20;
@@ -15,8 +21,6 @@
 
   networking.hostName = "carcajou";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.22";
   deuxfleurs.ipv6 = "2001:910:1204:1::22";
 
   deuxfleurs.cluster_ip = "10.14.1.2";
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index 02cb16d..2e8691a 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -10,8 +10,6 @@
 
   networking.hostName = "caribou";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.23";
   deuxfleurs.ipv6 = "2001:910:1204:1::23";
 
   deuxfleurs.cluster_ip = "10.14.1.3";
diff --git a/cluster/staging/node/df-pw5.nix b/cluster/staging/node/df-pw5.nix
index 33888d6..356a2ae 100644
--- a/cluster/staging/node/df-pw5.nix
+++ b/cluster/staging/node/df-pw5.nix
@@ -11,10 +11,11 @@
 
   networking.hostName = "df-pw5";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.5.130";
+  deuxfleurs.staticIPv4.address = "192.168.5.130/24";
   deuxfleurs.ipv6 = "2a02:a03f:6510:5102:223:24ff:feb0:e8a7";
 
   deuxfleurs.cluster_ip = "10.14.4.1";
   deuxfleurs.is_raft_server = false;
+
+  system.stateVersion = "22.11";
 }
diff --git a/cluster/staging/node/origan.nix b/cluster/staging/node/origan.nix
index 50bce58..6db7f87 100644
--- a/cluster/staging/node/origan.nix
+++ b/cluster/staging/node/origan.nix
@@ -10,8 +10,7 @@
 
   networking.hostName = "origan";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.33";
+  deuxfleurs.staticIPv4.address = "192.168.1.33/24";
   deuxfleurs.ipv6 = "2a01:e0a:5e4:1d0:223:24ff:feaf:fdec";
 
   deuxfleurs.cluster_ip = "10.14.2.33";
diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix
index 9ac2a07..4873693 100644
--- a/cluster/staging/node/piranha.nix
+++ b/cluster/staging/node/piranha.nix
@@ -10,8 +10,7 @@
 
   networking.hostName = "piranha";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.25";
+  deuxfleurs.staticIPv4.address = "192.168.1.25/24";
   deuxfleurs.ipv6 = "2a01:cb05:8984:9900:223:24ff:feb0:ea82";
 
   deuxfleurs.cluster_ip = "10.14.3.1";
diff --git a/cluster/staging/site/bespin.nix b/cluster/staging/site/bespin.nix
index 1133603..3fcefbb 100644
--- a/cluster/staging/site/bespin.nix
+++ b/cluster/staging/site/bespin.nix
@@ -2,10 +2,7 @@
 
 {
   deuxfleurs.site_name = "bespin";
-  deuxfleurs.lan_default_gateway = "192.168.5.254";
-  deuxfleurs.ipv6_default_gateway = "2a02:a03f:6510:5102::1";
-  deuxfleurs.lan_ip_prefix_length = 24;
-  deuxfleurs.ipv6_prefix_length = 64;
+  deuxfleurs.staticIPv4.defaultGateway = "192.168.5.254";
   deuxfleurs.cname_target = "bespin.site.staging.deuxfleurs.org.";
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/cluster/staging/site/corrin.nix b/cluster/staging/site/corrin.nix
index 8bf8693..0ff7b80 100644
--- a/cluster/staging/site/corrin.nix
+++ b/cluster/staging/site/corrin.nix
@@ -2,10 +2,7 @@
 
 {
   deuxfleurs.site_name = "corrin";
-  deuxfleurs.lan_default_gateway = "192.168.1.1";
-  deuxfleurs.ipv6_default_gateway = "fe80::7ec1:77ff:fe3e:bb90";
-  deuxfleurs.lan_ip_prefix_length = 24;
-  deuxfleurs.ipv6_prefix_length = 64;
+  deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
   deuxfleurs.cname_target = "corrin.site.staging.deuxfleurs.org.";
   deuxfleurs.public_ipv4 = "82.120.233.78";
 
diff --git a/cluster/staging/site/jupiter.nix b/cluster/staging/site/jupiter.nix
index 291e582..2269836 100644
--- a/cluster/staging/site/jupiter.nix
+++ b/cluster/staging/site/jupiter.nix
@@ -2,10 +2,7 @@
 
 {
   deuxfleurs.site_name = "jupiter";
-  deuxfleurs.lan_default_gateway = "192.168.1.1";
-  deuxfleurs.ipv6_default_gateway = "fe80::9038:202a:73a0:e73b";
-  deuxfleurs.lan_ip_prefix_length = 24;
-  deuxfleurs.ipv6_prefix_length = 64;
+  deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
   deuxfleurs.cname_target = "jupiter.site.staging.deuxfleurs.org.";
 
   # no public ipv4 is used for the staging cluster on Jupiter
diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix
index b030b46..36d5957 100644
--- a/cluster/staging/site/neptune.nix
+++ b/cluster/staging/site/neptune.nix
@@ -2,10 +2,6 @@
 
 {
   deuxfleurs.site_name = "neptune";
-  deuxfleurs.lan_default_gateway = "192.168.1.1";
-  deuxfleurs.ipv6_default_gateway = "2001:910:1204:1::1";
-  deuxfleurs.lan_ip_prefix_length = 24;
-  deuxfleurs.ipv6_prefix_length = 64;
   deuxfleurs.cname_target = "neptune.site.staging.deuxfleurs.org.";
 
   # no public ipv4 is used for the staging cluster on Neptune,