Add origan node in staging cluster (+ refactor system.stateVersion)

11 files changed, 67 insertions, 9 deletions

diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index 95391ac..59fbcb5 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -117,4 +117,10 @@
 
   # For Garage external communication
   networking.firewall.allowedTCPPorts = [ 3901 ];
+
+  # All prod nodes were deployed on the same version.
+  # This could be put in individual node .nix files if we deploy
+  # newer nodes on a different system version, OR we can bump this
+  # regularly cluster-wide
+  system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/app/core/deploy/core-system.hcl b/cluster/staging/app/core/deploy/core-system.hcl
index d410573..15dc77f 100644
--- a/cluster/staging/app/core/deploy/core-system.hcl
+++ b/cluster/staging/app/core/deploy/core-system.hcl
@@ -1,5 +1,5 @@
 job "core-system" {
-  datacenters = ["neptune"]
+  datacenters = ["neptune", "jupiter"]
   type = "system"
   priority = 90
 
@@ -13,6 +13,7 @@ job "core-system" {
     stagger = "1m"
   }
 
+/*
   group "diplonat" {
     task "diplonat" {
       driver = "nix2"
@@ -68,6 +69,7 @@ EOH
       }
     }
   }
+  */
 
   group "tricot" {
     network {
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index b9a4fed..42353e0 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -32,6 +32,14 @@
       lan_endpoint = "192.168.1.23:33799";
       endpoint = "77.207.15.215:33723";
     }
+    {
+      hostname = "origan";
+      site_name = "jupiter";
+      publicKey = "smBQYUS60JDkNoqkTT7TgbpqFiM43005fcrT6472llI=";
+      IP = "10.14.2.33";
+      lan_endpoint = "192.168.1.33:33799";
+      endpoint = "192.168.1.199:33799";  # TODO NAT
+    }
   ];
 
   # Bootstrap IPs for Consul cluster,
diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
index b6d15df..0ec2582 100644
--- a/cluster/staging/node/carcajou.nix
+++ b/cluster/staging/node/carcajou.nix
@@ -21,4 +21,6 @@
 
   deuxfleurs.cluster_ip = "10.14.1.2";
   deuxfleurs.is_raft_server = true;
+
+  system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/node/cariacou.nix b/cluster/staging/node/cariacou.nix
index 61d3f28..d8fe564 100644
--- a/cluster/staging/node/cariacou.nix
+++ b/cluster/staging/node/cariacou.nix
@@ -21,4 +21,6 @@
 
   deuxfleurs.cluster_ip = "10.14.1.1";
   deuxfleurs.is_raft_server = true;
+
+  system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index 65168a9..af46273 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -19,4 +19,6 @@
 
   # Open SSB port
   networking.firewall.allowedTCPPorts = [ 8008 ];
+
+  system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/node/origan.nix b/cluster/staging/node/origan.nix
new file mode 100644
index 0000000..3085cca
--- /dev/null
+++ b/cluster/staging/node/origan.nix
@@ -0,0 +1,24 @@
+# Configuration file local to this node
+
+{ config, pkgs, ... }:
+
+{
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.timeout = 20;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "origan";
+
+  deuxfleurs.network_interface = "eno1";
+  deuxfleurs.lan_ip = "192.168.1.33";
+  deuxfleurs.ipv6 = "2a01:e0a:5e4:1d0:223:24ff:feaf:fdec";
+
+  deuxfleurs.cluster_ip = "10.14.2.33";
+  deuxfleurs.is_raft_server = false;
+
+  # Open SSB port
+  networking.firewall.allowedTCPPorts = [ 8008 ];
+
+  system.stateVersion = "22.11";
+}
diff --git a/cluster/staging/node/origan.site.nix b/cluster/staging/node/origan.site.nix
new file mode 120000
index 0000000..7cdd625
--- /dev/null
+++ b/cluster/staging/node/origan.site.nix
@@ -0,0 +1 @@
+../site/jupiter.nix
\ No newline at end of file
diff --git a/cluster/staging/site/jupiter.nix b/cluster/staging/site/jupiter.nix
new file mode 100644
index 0000000..31b9f47
--- /dev/null
+++ b/cluster/staging/site/jupiter.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  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.nameservers = [ "192.168.1.1" ];
+  deuxfleurs.cname_target = "jupiter.site.staging.deuxfleurs.org.";
+
+  # no public ipv4 is used for the staging cluster on Jupiter
+  # deuxfleurs.public_ipv4 = "???";
+
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+}
diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix
index 506da65..5399826 100644
--- a/cluster/staging/site/neptune.nix
+++ b/cluster/staging/site/neptune.nix
@@ -14,12 +14,4 @@
   # deuxfleurs.public_ipv4 = "77.207.15.215";
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-  services.cron = {
-    enable = true;
-    systemCronJobs = [
-      "0 2 * * * root nix-collect-garbage --delete-older-than 10d >> /root/nix_gc_log 2>&1"
-      "30 2 1 * * root docker run --rm -v /var/lib/drone/nix:/nix nixpkgs/nix:nixos-21.05 nix-collect-garbage --delete-older-than 30d >> /root/drone_nix_gc_log 2>&1"
-    ];
-  };
 }
diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config
index 0f8ea0a..407d39b 100644
--- a/cluster/staging/ssh_config
+++ b/cluster/staging/ssh_config
@@ -15,3 +15,6 @@ Host cariacou
 Host spoutnik
 	HostName 10.42.0.2
 	Port 220
+
+Host origan
+	HostName 2a01:e0a:5e4:1d0:223:24ff:feaf:fdec