From f0281706f4cab5bca11cd8b9c7fdbb91c46aca86 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Wed, 28 Aug 2024 11:01:06 +0200
Subject: [PATCH] garage: move back to facts

Move back to facts until vars is in a useable state.
---
 clanModules/garage/default.nix | 41 ++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/clanModules/garage/default.nix b/clanModules/garage/default.nix
index 637068e17..0ddd184da 100644
--- a/clanModules/garage/default.nix
+++ b/clanModules/garage/default.nix
@@ -2,9 +2,9 @@
 {
   systemd.services.garage.serviceConfig = {
     LoadCredential = [
-      "rpc_secret_path:${config.clan.core.vars.generators.garage.files.rpc_secret.path}"
-      "admin_token_path:${config.clan.core.vars.generators.garage.files.admin_token.path}"
-      "metrics_token_path:${config.clan.core.vars.generators.garage.files.metrics_token.path}"
+      "rpc_secret_path:${config.clan.core.facts.services.garage.secret.garage_rpc_secret.path}"
+      "admin_token_path:${config.clan.core.facts.services.garage.secret.garage_admin_token.path}"
+      "metrics_token_path:${config.clan.core.facts.services.garage.secret.garage_metrics_token.path}"
     ];
     Environment = [
       "GARAGE_ALLOW_WORLD_READABLE_SECRETS=true"
@@ -14,20 +14,37 @@
     ];
   };
 
-  clan.core.vars.generators.garage = {
-    files.rpc_secret = { };
-    files.admin_token = { };
-    files.metrics_token = { };
-    runtimeInputs = [
+  clan.core.facts.services.garage = {
+    secret.garage_rpc_secret = { };
+    secret.garage_admin_token = { };
+    secret.garage_metrics_token = { };
+    generator.path = [
       pkgs.coreutils
       pkgs.openssl
     ];
-    script = ''
-      openssl rand -hex -out $out/rpc_secret 32
-      openssl rand -base64 -out $out/admin_token 32
-      openssl rand -base64 -out $out/metrics_token 32
+    generator.script = ''
+      openssl rand -hex -out $secrets/garage_rpc_secret 32
+      openssl rand -base64 -out $secrets/garage_admin_token 32
+      openssl rand -base64 -out $secrets/garage_metrics_token 32
     '';
   };
 
+  # TODO: Vars is not in a useable state currently
+  # Move back, once it is implemented.
+  # clan.core.vars.generators.garage = {
+  #   files.rpc_secret = { };
+  #   files.admin_token = { };
+  #   files.metrics_token = { };
+  #   runtimeInputs = [
+  #     pkgs.coreutils
+  #     pkgs.openssl
+  #   ];
+  #   script = ''
+  #     openssl rand -hex -out $out/rpc_secret 32
+  #     openssl rand -base64 -out $out/admin_token 32
+  #     openssl rand -base64 -out $out/metrics_token 32
+  #   '';
+  # };
+
   clan.core.state.garage.folders = [ config.services.garage.settings.metadata_dir ];
 }