Configuration for prod to run on Wesher & other new stuff

5 files changed, 37 insertions, 86 deletions

diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index d131db7..ece401e 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -2,64 +2,42 @@
 
 {
   deuxfleurs.cluster_name = "prod";
-  deuxfleurs.cluster_nodes = [
-    {
-      hostname = "concombre";
-      site_name = "neptune";
-      publicKey = "VvXT0fPDfWsHxumZqVShpS33dJQAdpJ1E79ZbCBJP34=";
-      IP = "10.42.1.31";
-      endpoint = "82.66.112.151:33731";
-      lan_endpoint = "192.168.1.31:33731";
-    }
-    {
-      hostname = "courgette";
-      site_name = "neptune";
-      publicKey = "goTkBJGmzrGDOAjUcdH9G0JekipqSMoaYQdB6IHnzi0=";
-      IP = "10.42.1.32";
-      endpoint = "82.66.112.151:33732";
-      lan_endpoint = "192.168.1.32:33732";
-    }
-    {
-      hostname = "celeri";
-      site_name = "neptune";
-      publicKey = "oZDAb8LoLW87ktUHyFFec0VaIar97bqq47mGbdVqJ0U=";
-      IP = "10.42.1.33";
-      endpoint = "82.66.112.151:33733";
-      lan_endpoint = "192.168.1.33:33733";
-    }
+
+  # Bootstrap nodes for Wesher overlay network
+  services.wesher.join = [
+	"2a01:e0a:c:a720::31"  # concombre
+	"2a01:e0a:c:a720::32"  # courgette
+	"2a01:e0a:c:a720::33"  # celeri
   ];
-  deuxfleurs.admin_nodes = [
-    {
-      hostname = "hammerhead";
-      publicKey = "b5hF+GSTgg3oM6wnjL7jRbfyf1jtsWdVptPPbAh3Qic=";
-      IP = "10.42.0.1";
-      endpoint = "5.135.179.11:51349";
-    }
-    {
-      hostname = "robinson";
-      publicKey = "ETaZFil3mFXlJ0LaJZyWqJVLV2IZUF5PB/8M7WbQSTg=";
-      IP = "10.42.0.42";
-      endpoint = "77.141.67.109:33742";
-    }
-    {
-      hostname = "shiki";
-      publicKey = "QUiUNMk70TEQ75Ut7Uqikr5uGVSXmx8EGNkGM6tANlg=";
-      IP = "10.42.0.206";
-      endpoint = "37.187.118.206:51820";
-    }
-    {
-      hostname = "lindy";
-      publicKey = "wen9GnZy2iLT6RyHfn7ydS/wvdvow1XPmhZxIkrDbks=";
-      IP = "10.42.0.66";
-      endpoint = "82.66.112.151:33766";
-    }
+
+  # 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;
+
+  # 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
   ];
+
   deuxfleurs.admin_accounts = {
     lx = [
       # Keys for accessing nodes from outside
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJpaBZdYxHqMxhv2RExAOa7nkKhPBOHupMP3mYaZ73w9 lx@lindy"
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIDdVbA9fEdqSr5UJ77NnoIqDTVp8ca5kHExhZYI4ecBExFJfonJllXMBN9KdC4ukxtY8Ug47PcMOfMaTBZQc+e+KpvDWpkBt15Xpem3RCxmMBES79sLL7LgtAdBXc5mNaCX8EOEVixWKdarjvxRyf6py6the51G5muaiMpoj5fae4ZpRGjhGTPefzc7y7zRWBUUZ8pYHW774BIaK6XT9gn3hyHV+Occjl/UODXvodktk55YtnuPi8adXTYEsHrVVz8AkFhx+cr0U/U8vtQnsTrZG+JmgQLqpXVs0RDw5bE1RefEbMuYNKxutYKUe3L+ZJtDe0M0MqOFI8a4F5TxP5 katchup@konata"
     ];
+    quentin = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT1+H08FdUSvdPpPKdcafq4+JRHvFVjfvG5Id97LAoROmFRUb/ZOMTLdNuD7FqvW0Da5CPxIMr8ZxfrFLtpGyuG7qdI030iIRZPlKpBh37epZHaV+l9F4ZwJQMIBO9cuyLPXgsyvM/s7tDtrdK1k7JTf2EVvoirrjSzBaMhAnhi7//to8zvujDtgDZzy6aby75bAaDetlYPBq2brWehtrf9yDDG9WAMYJqp//scje/WmhbRR6eSdim1HaUcWk5+4ZPt8sQJcy8iWxQ4jtgjqTvMOe5v8ZPkxJNBine/ZKoJsv7FzKem00xEH7opzktaGukyEqH0VwOwKhmBiqsX2yN quentin@dufour.io"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBu+KUebaWwlugMC5fGbNhHc6IaQDAC6+1vMc4Ww7nVU1rs2nwI7L5qcWxOwNdhFaorZQZy/fJuCWdFbF61RCKGayBWPLZHGPsfqDuggYNEi1Qil1kpeCECfDQNjyMTK058ZBBhOWNMHBjlLWXUlRJDkRBBECY0vo4jRv22SvSaPUCAnkdJ9rbAp/kqb497PTIb2r1l1/ew8YdhINAlpYQFQezZVfkZdTKxt22n0QCjhupqjfh3gfNnbBX0z/iO+RvAOWRIZsjPFLC+jXl+n7cnu2cq1nvST5eHiYfXXeIgIwmeENLKqp+2Twr7PIdv22PnJkh6iR5kx7eTRxkNZdN quentin@deuxfleurs.fr"
+    ];
+    adrien = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBfVX+iQSHl3V0el3/y2Rtl9Q/nrmLoTE3oXnR+16yX7g8HvzU871q89jbE/UWvNRvO4hirTcKF8yojuq8ZRCoUcQO+6/YlPrY/2G8kFhPTlUGDQ+mLT+ancZsom4mkg3I9oQjKZ9qxMD1GuU8Ydz4eXjhJ8OGFZhBpEgnrLmdA53Y5d2fCbaZN5EYD4sWEFYN7xBLxTGNwv0gygiPs967Z4/ZfHngTvqVoS9wnQThSCIoXPTWFAJCkN8dC5tPZwnbOT1bGcYUF0VTrcaD6cU6Q1ZRrtyqXxnnyxpQCAoe2hgdIm+LnDsBx9trfPauqi0dXi36X8pLmudW1f1RmKWT adrien@bacigalupi"
+    ];
+    maximilien = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHMMR6zNzz8NQU80wFquhUCeiXJuGphjP+zNouKbn228GyESu8sfNBwnuZq86vblR11Lz8l2rtCM73GfAKg29qmUWUHRKWvRIYWv2vaUJcCdy0bAxIzcvCvjZX0SpnIKxe9y3Rp0LGO5WLYfw0ZFaavwFZP0Z8w1Kj9/zBmL2X2avbhkaYHi/C1yXhbvESYQysmqLa48EX/TS616MBrgR9zbI9AoTQ9NOHnR14Tve/AP/khcZoBJdm4hTttMbNkEc0wonzdylTDew263SPRs/uoqnQIpUtErdPHqU10Yup8HjXjEyFJsSwcZcM5sZOw5JKckKJwmcd0yjO/x/4/Mk5"
+    ];
   };
 
   # For Garage external communication
diff --git a/cluster/prod/node/celeri.nix b/cluster/prod/node/celeri.nix
index 02a33c9..9317de4 100644
--- a/cluster/prod/node/celeri.nix
+++ b/cluster/prod/node/celeri.nix
@@ -12,18 +12,8 @@
 
   deuxfleurs.network_interface = "eno1";
   deuxfleurs.lan_ip = "192.168.1.33";
+  deuxfleurs.ipv6 = "2a01:e0a:c:a720::33";
 
-  networking.interfaces.eno1.ipv6.addresses = [
-    {
-      address = "2a01:e0a:c:a720::33";
-      prefixLength = 64;
-    }
-  ];
-
-  deuxfleurs.vpn_ip = "10.42.1.33";
-  deuxfleurs.vpn_listen_port = 33733;
+  deuxfleurs.cluster_ip = "10.83.12.147";
   deuxfleurs.is_raft_server = true;
-
-  # Enable netdata monitoring
-  services.netdata.enable = true;
 }
diff --git a/cluster/prod/node/concombre.nix b/cluster/prod/node/concombre.nix
index 517dcf8..c38e89d 100644
--- a/cluster/prod/node/concombre.nix
+++ b/cluster/prod/node/concombre.nix
@@ -12,18 +12,8 @@
 
   deuxfleurs.network_interface = "eno1";
   deuxfleurs.lan_ip = "192.168.1.31";
+  deuxfleurs.ipv6 = "2a01:e0a:c:a720::31";
 
-  networking.interfaces.eno1.ipv6.addresses = [
-    {
-      address = "2a01:e0a:c:a720::31";
-      prefixLength = 64;
-    }
-  ];
-
-  deuxfleurs.vpn_ip = "10.42.1.31";
-  deuxfleurs.vpn_listen_port = 33731;
+  deuxfleurs.cluster_ip = "10.83.101.43";
   deuxfleurs.is_raft_server = true;
-
-  # Enable netdata monitoring
-  services.netdata.enable = true;
 }
diff --git a/cluster/prod/node/courgette.nix b/cluster/prod/node/courgette.nix
index d34e7a5..d31af77 100644
--- a/cluster/prod/node/courgette.nix
+++ b/cluster/prod/node/courgette.nix
@@ -12,18 +12,8 @@
 
   deuxfleurs.network_interface = "eno1";
   deuxfleurs.lan_ip = "192.168.1.32";
+  deuxfleurs.ipv6 = "2a01:e0a:c:a720::32";
 
-  networking.interfaces.eno1.ipv6.addresses = [
-    {
-      address = "2a01:e0a:c:a720::32";
-      prefixLength = 64;
-    }
-  ];
-
-  deuxfleurs.vpn_ip = "10.42.1.32";
-  deuxfleurs.vpn_listen_port = 33732;
+  deuxfleurs.cluster_ip = "10.83.66.147";
   deuxfleurs.is_raft_server = true;
-
-  # Enable netdata monitoring
-  services.netdata.enable = true;
 }
diff --git a/cluster/prod/site/neptune.nix b/cluster/prod/site/neptune.nix
index 900ddf0..6e69b18 100644
--- a/cluster/prod/site/neptune.nix
+++ b/cluster/prod/site/neptune.nix
@@ -4,6 +4,9 @@
   deuxfleurs.site_name = "neptune";
   deuxfleurs.lan_default_gateway = "192.168.1.254";
   deuxfleurs.lan_ip_prefix_length = 24;
+  deuxfleurs.ipv6_prefix_length = 64;
 
   networking.nameservers = [ "192.168.1.254" ];
+
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }