Move prod to wireguard and not wesher, and reaffect IPs

4 files changed, 35 insertions, 15 deletions

diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index 1bf4a7b..5446212 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -3,23 +3,43 @@
 {
   deuxfleurs.cluster_name = "prod";
 
-  # Bootstrap nodes for Wesher overlay network
-  services.wesher.join = [
-	"192.168.1.31"  # concombre
-	"192.168.1.32"  # courgette
-	"192.168.1.33"  # celeri
-  ];
+  # The IP range to use for the Wireguard overlay of this cluster
+  deuxfleurs.cluster_prefix = "10.83.0.0";
+  deuxfleurs.cluster_prefix_length = 16;
 
-  # The IP range to use for the Wesher overlay of this cluster
-  deuxfleurs.wesher_cluster_prefix = "10.83.0.0";
-  deuxfleurs.wesher_cluster_prefix_length = 16;
+  deuxfleurs.cluster_nodes = [
+    {
+      hostname = "concombre";
+      site_name = "neptune";
+      publicKey = "VvXT0fPDfWsHxumZqVShpS33dJQAdpJ1E79ZbCBJP34=";
+      IP = "10.83.1.1";
+      lan_endpoint = "192.168.1.31:33799";
+      endpoint = "77.207.15.215:33731";
+    }
+    {
+      hostname = "courgette";
+      site_name = "neptune";
+      publicKey = "goTkBJGmzrGDOAjUcdH9G0JekipqSMoaYQdB6IHnzi0=";
+      IP = "10.83.1.2";
+      lan_endpoint = "192.168.1.32:33799";
+      endpoint = "77.207.15.215:33732";
+    }
+    {
+      hostname = "celeri";
+      site_name = "neptune";
+      publicKey = "oZDAb8LoLW87ktUHyFFec0VaIar97bqq47mGbdVqJ0U=";
+      IP = "10.83.1.3";
+      lan_endpoint = "192.168.1.33:33799";
+      endpoint = "77.207.15.215:33733";
+    }
+  ];
 
   # Bootstrap IPs for Consul cluster,
   # these are IPs on the Wesher overlay
   services.consul.extraConfig.retry_join = [
-    "10.83.101.43"  # concombre
-    "10.83.66.14"  # courgette
-    "10.83.12.147"  # celeri
+    "10.83.1.1"  # concombre
+    "10.83.1.2"  # courgette
+    "10.83.1.3"  # celeri
   ];
 
   deuxfleurs.admin_accounts = {
diff --git a/cluster/prod/node/celeri.nix b/cluster/prod/node/celeri.nix
index a018f1b..56f1f7e 100644
--- a/cluster/prod/node/celeri.nix
+++ b/cluster/prod/node/celeri.nix
@@ -14,6 +14,6 @@
   deuxfleurs.lan_ip = "192.168.1.33";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::33";
 
-  deuxfleurs.cluster_ip = "10.83.12.147";
+  deuxfleurs.cluster_ip = "10.83.1.3";
   deuxfleurs.is_raft_server = true;
 }
diff --git a/cluster/prod/node/concombre.nix b/cluster/prod/node/concombre.nix
index 782e7e7..8b82cb9 100644
--- a/cluster/prod/node/concombre.nix
+++ b/cluster/prod/node/concombre.nix
@@ -14,6 +14,6 @@
   deuxfleurs.lan_ip = "192.168.1.31";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::31";
 
-  deuxfleurs.cluster_ip = "10.83.101.43";
+  deuxfleurs.cluster_ip = "10.83.1.1";
   deuxfleurs.is_raft_server = true;
 }
diff --git a/cluster/prod/node/courgette.nix b/cluster/prod/node/courgette.nix
index 0dd8208..c0a7ff1 100644
--- a/cluster/prod/node/courgette.nix
+++ b/cluster/prod/node/courgette.nix
@@ -14,6 +14,6 @@
   deuxfleurs.lan_ip = "192.168.1.32";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::32";
 
-  deuxfleurs.cluster_ip = "10.83.66.147";
+  deuxfleurs.cluster_ip = "10.83.1.2";
   deuxfleurs.is_raft_server = true;
 }