From f1f0611bbc0eb52cf6915469758587f17ba932ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Mon, 16 Dec 2024 13:06:35 +0100
Subject: [PATCH] Discontinue two old actions runners

---
 infra/README.org          |  9 +++---
 infra/flake-part.nix      | 60 ++++++++++++++++++++++-----------------
 infra/vm02179/default.nix |  1 -
 infra/vm02186/default.nix |  1 -
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/infra/README.org b/infra/README.org
index c50af47..a62e3b7 100644
--- a/infra/README.org
+++ b/infra/README.org
@@ -18,6 +18,7 @@ nixops4 apply <deployment>
 - ~git~ :: Machines hosting our Git infrastructure, eg. Forgejo and its actions
   runners
 - ~web~ :: Machines hosting our online content, eg. the website or the wiki
+- ~other~ :: Machines without a specific purpose
 
 * Procolix machines
 
@@ -27,7 +28,7 @@ infrastructure.
 
 | Machine | Description            | Deployment |
 |---------+------------------------+------------|
-| vm02116 | Forgejo                | ~git~        |
-| vm02179 | Forgejo actions runner | ~git~        |
-| vm02186 | Forgejo actions runner | ~git~        |
-| vm02187 | Wiki                   | ~web~        |
+| vm02116 | Forgejo                | ~git~      |
+| vm02179 | /unused/               | ~other~    |
+| vm02186 | /unused/               | ~other~    |
+| vm02187 | Wiki                   | ~web~      |
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index bed71fc..16008ae 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -24,7 +24,41 @@
             ];
           };
         };
+      };
+    };
 
+  nixops4Deployments.web =
+    { providers, ... }:
+    {
+      providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
+
+      resources = {
+        vm02187 = {
+          type = providers.local.exec;
+          imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
+          ssh = {
+            host = "185.206.232.187";
+            opts = "";
+            hostPublicKey = self.keys.systems.vm02187;
+          };
+          nixpkgs = inputs.nixpkgs;
+          nixos.module = {
+            imports = [
+              ./vm02187
+              self.nixosModules.ageSecrets
+              { fediversity.hostPublicKey = self.keys.systems.vm02187; }
+            ];
+          };
+        };
+      };
+    };
+
+  nixops4Deployments.other =
+    { providers, ... }:
+    {
+      providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
+
+      resources = {
         vm02179 = {
           type = providers.local.exec;
           imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
@@ -62,30 +96,4 @@
         };
       };
     };
-
-  nixops4Deployments.web =
-    { providers, ... }:
-    {
-      providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
-
-      resources = {
-        vm02187 = {
-          type = providers.local.exec;
-          imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
-          ssh = {
-            host = "185.206.232.187";
-            opts = "";
-            hostPublicKey = self.keys.systems.vm02187;
-          };
-          nixpkgs = inputs.nixpkgs;
-          nixos.module = {
-            imports = [
-              ./vm02187
-              self.nixosModules.ageSecrets
-              { fediversity.hostPublicKey = self.keys.systems.vm02187; }
-            ];
-          };
-        };
-      };
-    };
 }
diff --git a/infra/vm02179/default.nix b/infra/vm02179/default.nix
index f5065ee..c532b44 100644
--- a/infra/vm02179/default.nix
+++ b/infra/vm02179/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ../common
-    ./gitea-runner.nix
   ];
 
   procolix.vm = {
diff --git a/infra/vm02186/default.nix b/infra/vm02186/default.nix
index cc93772..ba477f3 100644
--- a/infra/vm02186/default.nix
+++ b/infra/vm02186/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ../common
-    ./gitea-runner.nix
   ];
 
   procolix.vm = {