refactor configuration syntax

5 files changed, 13 insertions, 29 deletions

diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
index 5822f49..e6c1653 100644
--- a/cluster/staging/node/carcajou.nix
+++ b/cluster/staging/node/carcajou.nix
@@ -19,11 +19,8 @@
   boot.loader.timeout = 20;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "carcajou";
-
-  deuxfleurs.ipv6 = "2001:910:1204:1::22";
-
-  deuxfleurs.cluster_ip = "10.14.1.2";
+  deuxfleurs.hostName = "carcajou";
+  deuxfleurs.ipv6Address = "2001:910:1204:1::22";
 
   system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index 2e8691a..ad5a65d 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -8,12 +8,9 @@
   boot.loader.timeout = 20;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "caribou";
-
-  deuxfleurs.ipv6 = "2001:910:1204:1::23";
-
-  deuxfleurs.cluster_ip = "10.14.1.3";
-  deuxfleurs.is_raft_server = true;
+  deuxfleurs.hostName = "caribou";
+  deuxfleurs.ipv6Address = "2001:910:1204:1::23";
+  deuxfleurs.isRaftServer = true;
 
   system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/node/df-pw5.nix b/cluster/staging/node/df-pw5.nix
index 356a2ae..0e5be15 100644
--- a/cluster/staging/node/df-pw5.nix
+++ b/cluster/staging/node/df-pw5.nix
@@ -9,13 +9,9 @@
   boot.loader.efi.efiSysMountPoint = "/boot";
   boot.loader.timeout = 20;
 
-  networking.hostName = "df-pw5";
-
+  deuxfleurs.hostName = "df-pw5";
   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;
+  deuxfleurs.ipv6Address = "2a02:a03f:6510:5102:223:24ff:feb0:e8a7";
 
   system.stateVersion = "22.11";
 }
diff --git a/cluster/staging/node/origan.nix b/cluster/staging/node/origan.nix
index 6db7f87..d900fd6 100644
--- a/cluster/staging/node/origan.nix
+++ b/cluster/staging/node/origan.nix
@@ -8,13 +8,10 @@
   boot.loader.timeout = 20;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "origan";
-
+  deuxfleurs.hostName = "origan";
   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";
-  deuxfleurs.is_raft_server = true;
+  deuxfleurs.ipv6Address = "2a01:e0a:5e4:1d0:223:24ff:feaf:fdec";
+  deuxfleurs.isRaftServer = true;
 
   system.stateVersion = "22.11";
 }
diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix
index 4873693..436965c 100644
--- a/cluster/staging/node/piranha.nix
+++ b/cluster/staging/node/piranha.nix
@@ -8,13 +8,10 @@
   boot.loader.timeout = 20;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "piranha";
-
+  deuxfleurs.hostName = "piranha";
   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";
-  deuxfleurs.is_raft_server = true;
+  deuxfleurs.ipv6Address = "2a01:cb05:8984:9900:223:24ff:feb0:ea82";
+  deuxfleurs.isRaftServer = true;
 
   system.stateVersion = "22.11";
 }