From fcfc35e5f94b9891b25d04307d4ef20af5fef849 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 3 May 2025 22:37:09 -0400 Subject: [PATCH] [marvin.forgejo] move secrets to subdir --- systems/x86_64-linux/marvin/services/git.nix | 18 +++++++++--------- .../aux-docs-runner-token.age} | Bin .../{forgejo-db-pw.age => forgejo/db-pw.age} | 0 .../default-runner-token.age} | 0 .../gitgay-runner-token.age} | 0 .../internal-token.age} | Bin .../lfs-jwt-secret.age} | Bin .../mail-pw.age} | 0 .../oauth2-jwt-secret.age} | 0 .../secret-key.age} | 0 .../marvin/services/secrets/secrets.nix | 18 +++++++++--------- 11 files changed, 18 insertions(+), 18 deletions(-) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-aux-docs-runner-token.age => forgejo/aux-docs-runner-token.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-db-pw.age => forgejo/db-pw.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-default-runner-token.age => forgejo/default-runner-token.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-gitgay-runner-token.age => forgejo/gitgay-runner-token.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-internal-token.age => forgejo/internal-token.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-lfs-jwt-secret.age => forgejo/lfs-jwt-secret.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-mail-pw.age => forgejo/mail-pw.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-oauth2-jwt-secret.age => forgejo/oauth2-jwt-secret.age} (100%) rename systems/x86_64-linux/marvin/services/secrets/{forgejo-secret-key.age => forgejo/secret-key.age} (100%) diff --git a/systems/x86_64-linux/marvin/services/git.nix b/systems/x86_64-linux/marvin/services/git.nix index 4917a0de..73395f2e 100644 --- a/systems/x86_64-linux/marvin/services/git.nix +++ b/systems/x86_64-linux/marvin/services/git.nix @@ -119,31 +119,31 @@ in }; age.secrets = { forgejo-db-pw = forgejoSecret // { - file = ./secrets/forgejo-db-pw.age; + file = ./secrets/forgejo/db-pw.age; }; forgejo-mail-pw = forgejoSecret // { - file = ./secrets/forgejo-mail-pw.age; + file = ./secrets/forgejo/mail-pw.age; }; forgejo-aux-docs-runner-token = forgejoSecret // { - file = ./secrets/forgejo-aux-docs-runner-token.age; + file = ./secrets/forgejo/aux-docs-runner-token.age; }; forgejo-default-runner-token = forgejoSecret // { - file = ./secrets/forgejo-default-runner-token.age; + file = ./secrets/forgejo/default-runner-token.age; }; forgejo-gitgay-runner-token = forgejoSecret // { - file = ./secrets/forgejo-gitgay-runner-token.age; + file = ./secrets/forgejo/gitgay-runner-token.age; }; forgejo-internal-token = forgejoSecret // { - file = ./secrets/forgejo-internal-token.age; + file = ./secrets/forgejo/internal-token.age; }; forgejo-oauth2-jwt-secret = forgejoSecret // { - file = ./secrets/forgejo-oauth2-jwt-secret.age; + file = ./secrets/forgejo/oauth2-jwt-secret.age; }; forgejo-lfs-jwt-secret = forgejoSecret // { - file = ./secrets/forgejo-lfs-jwt-secret.age; + file = ./secrets/forgejo/lfs-jwt-secret.age; }; forgejo-secret-key = forgejoSecret // { - file = ./secrets/forgejo-secret-key.age; + file = ./secrets/forgejo/secret-key.age; }; }; services.anubis.instances.forgejo = { diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-aux-docs-runner-token.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/aux-docs-runner-token.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-aux-docs-runner-token.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/aux-docs-runner-token.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-db-pw.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/db-pw.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-db-pw.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/db-pw.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-default-runner-token.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/default-runner-token.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-default-runner-token.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/default-runner-token.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-gitgay-runner-token.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/gitgay-runner-token.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-gitgay-runner-token.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/gitgay-runner-token.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-internal-token.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/internal-token.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-internal-token.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/internal-token.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-lfs-jwt-secret.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/lfs-jwt-secret.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-lfs-jwt-secret.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/lfs-jwt-secret.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-mail-pw.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/mail-pw.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-mail-pw.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/mail-pw.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-oauth2-jwt-secret.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/oauth2-jwt-secret.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-oauth2-jwt-secret.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/oauth2-jwt-secret.age diff --git a/systems/x86_64-linux/marvin/services/secrets/forgejo-secret-key.age b/systems/x86_64-linux/marvin/services/secrets/forgejo/secret-key.age similarity index 100% rename from systems/x86_64-linux/marvin/services/secrets/forgejo-secret-key.age rename to systems/x86_64-linux/marvin/services/secrets/forgejo/secret-key.age diff --git a/systems/x86_64-linux/marvin/services/secrets/secrets.nix b/systems/x86_64-linux/marvin/services/secrets/secrets.nix index 08411718..055ed319 100644 --- a/systems/x86_64-linux/marvin/services/secrets/secrets.nix +++ b/systems/x86_64-linux/marvin/services/secrets/secrets.nix @@ -15,15 +15,15 @@ in "buildbot-gitea-token.age".publicKeys = marvinDefault; "buildbot-oauth-secret.age".publicKeys = marvinDefault; "buildbot-workers.age".publicKeys = marvinDefault; - "forgejo-db-pw.age".publicKeys = marvinDefault; - "forgejo-mail-pw.age".publicKeys = marvinDefault; - "forgejo-aux-docs-runner-token.age".publicKeys = marvinDefault; - "forgejo-default-runner-token.age".publicKeys = marvinDefault; - "forgejo-gitgay-runner-token.age".publicKeys = marvinDefault; - "forgejo-internal-token.age".publicKeys = marvinDefault; - "forgejo-lfs-jwt-secret.age".publicKeys = marvinDefault; - "forgejo-oauth2-jwt-secret.age".publicKeys = marvinDefault; - "forgejo-secret-key.age".publicKeys = marvinDefault; + "forgejo/aux-docs-runner-token.age".publicKeys = marvinDefault; + "forgejo/db-pw.age".publicKeys = marvinDefault; + "forgejo/default-runner-token.age".publicKeys = marvinDefault; + "forgejo/gitgay-runner-token.age".publicKeys = marvinDefault; + "forgejo/internal-token.age".publicKeys = marvinDefault; + "forgejo/lfs-jwt-secret.age".publicKeys = marvinDefault; + "forgejo/mail-pw.age".publicKeys = marvinDefault; + "forgejo/oauth2-jwt-secret.age".publicKeys = marvinDefault; + "forgejo/secret-key.age".publicKeys = marvinDefault; "golink-authkey.age".publicKeys = marvinDefault; "grafana-admin-password.age".publicKeys = marvinDefault; "grafana-smtp-password.age".publicKeys = marvinDefault; -- 2.54.0