From 88859390a6072a40b7ad71923a83c9bca7e53bd0 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Fri, 22 Mar 2024 20:51:04 +0100
Subject: [PATCH] feat(meta): Switch to new naming scheme for sites

---
 meta/dns.nix   |  6 ++++++
 meta/nodes.nix | 25 +++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/meta/dns.nix b/meta/dns.nix
index fc120bc..731cc8f 100644
--- a/meta/dns.nix
+++ b/meta/dns.nix
@@ -16,6 +16,12 @@ let
     "dev" = "dev.pages.codeberg.page.";
     "irc" = "public.p.lahfa.xyz.";
     "webmail" = "kurisu.dual.lahfa.xyz.";
+
+    # Transition to new site names
+    "web01.dmi01.infra" = "web01.rat01.infra";
+    "web02.dmi01.infra" = "web02.rat01.infra";
+    "compute01.par01.infra" = "compute01.pav01.infra";
+    "storage01.par01.infra" = "storage01.pav01.infra";
   };
 
   hosted = fuseAttrs (
diff --git a/meta/nodes.nix b/meta/nodes.nix
index ca2515d..c670c7b 100644
--- a/meta/nodes.nix
+++ b/meta/nodes.nix
@@ -12,14 +12,15 @@
 
 /*
   Liste des différents sites :
-  - dmi01 -> VM du NPSPI
-  - par01 -> Salle serveur sous le pavillon Pasteur
-  - par02 -> Local DGNum Jourdan
-  - par03 -> VM de Luj
+  - rat01 -> VM du NPSPI
+  - pav01 -> Salle serveur sous le pavillon Pasteur
+  - oik01 -> Local DGNum Jourdan
+  - hyp01 -> Salle serveur Hypnos 1
+  - luj01 -> VM de Luj
 */
 {
   web01 = {
-    site = "dmi01";
+    site = "rat01";
 
     deployment.tags = [ "web" ];
 
@@ -27,13 +28,13 @@
   };
 
   compute01 = {
-    site = "par01";
+    site = "pav01";
 
     stateVersion = "23.05";
   };
 
   geo01 = {
-    site = "par02";
+    site = "oik01";
     deployment.tags = [ "geo" ];
 
     stateVersion = "24.05";
@@ -41,7 +42,7 @@
   };
 
   geo02 = {
-    site = "par02";
+    site = "oik01";
     deployment.tags = [ "geo" ];
 
     stateVersion = "24.05";
@@ -49,12 +50,12 @@
   };
 
   storage01 = {
-    site = "par01";
+    site = "pav01";
     stateVersion = "23.11";
   };
 
   vault01 = {
-    site = "par02";
+    site = "hyp01";
     deployment.targetHost = "vault01.dgnum";
 
     stateVersion = "23.11";
@@ -62,14 +63,14 @@
   };
 
   web02 = {
-    site = "dmi01";
+    site = "rat01";
 
     stateVersion = "24.05";
     nixpkgs = "unstable";
   };
 
   rescue01 = {
-    site = "par03";
+    site = "luj01";
 
     stateVersion = "23.11";
   };