From 385882c74c80156b2740ac3bad009605468b4372 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 13 Mar 2023 19:58:37 +0100
Subject: Changes in prod:

- migrate courgette and concombre to M710q machines with SSD+HDD
- migrate prod/c* to nixos 22.11
---
 cluster/prod/app/cryptpad/deploy/cryptpad.hcl           | 4 ++--
 cluster/prod/app/telemetry/deploy/telemetry-storage.hcl | 2 +-
 cluster/prod/node/concombre.nix                         | 2 +-
 cluster/prod/node/courgette.nix                         | 2 +-
 upgrade_nixos                                           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
index 59803bf..0d8ac5f 100644
--- a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
+++ b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
@@ -22,7 +22,7 @@ job "cryptpad" {
       constraint {
         attribute = "${attr.unique.hostname}"
         operator = "="
-        value = "courgette"
+        value = "concombre"
       }
 
       config {
@@ -30,7 +30,7 @@ job "cryptpad" {
         ports = [ "http" ]
 
         volumes = [
-          "/mnt/storage/cryptpad:/mnt",
+          "/mnt/ssd/cryptpad:/mnt",
           "secrets/config.js:/etc/cryptpad/config.js",
         ]
       }
diff --git a/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl b/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
index bf64719..d4667fa 100644
--- a/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
+++ b/cluster/prod/app/telemetry/deploy/telemetry-storage.hcl
@@ -14,7 +14,7 @@ job "telemetry-storage" {
     constraint {
       attribute = "${attr.unique.hostname}"
       operator = "set_contains_any"
-      value = "concombre,df-ymk"
+      value = "celeri,df-ymk"
     }
 
     task "prometheus" {
diff --git a/cluster/prod/node/concombre.nix b/cluster/prod/node/concombre.nix
index 4e1563e..eefc9e7 100644
--- a/cluster/prod/node/concombre.nix
+++ b/cluster/prod/node/concombre.nix
@@ -10,7 +10,7 @@
 
   networking.hostName = "concombre";
 
-  deuxfleurs.network_interface = "eno1";
+  deuxfleurs.network_interface = "enp0s31f6";
   deuxfleurs.lan_ip = "192.168.1.31";
   deuxfleurs.ipv6 = "2001:910:1204:1::31";
 
diff --git a/cluster/prod/node/courgette.nix b/cluster/prod/node/courgette.nix
index cbcb745..c2bf0d8 100644
--- a/cluster/prod/node/courgette.nix
+++ b/cluster/prod/node/courgette.nix
@@ -10,7 +10,7 @@
 
   networking.hostName = "courgette";
 
-  deuxfleurs.network_interface = "eno1";
+  deuxfleurs.network_interface = "enp0s31f6";
   deuxfleurs.lan_ip = "192.168.1.32";
   deuxfleurs.ipv6 = "2001:910:1204:1::32";
 
diff --git a/upgrade_nixos b/upgrade_nixos
index df3d259..dcfeb5f 100755
--- a/upgrade_nixos
+++ b/upgrade_nixos
@@ -1,6 +1,6 @@
 #!/usr/bin/env ./sshtool
 
-if [ "$CLUSTER" = "staging" ]; then
+if [ "$CLUSTER" = "staging" -o "$NIXHOST" = "concombre" -o "$NIXHOST" = "courgette" -o "$NIXHOST" = "celeri" ]; then
 	cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
 else
 	cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
-- 
cgit v1.2.3