From 878c06b63b44bd86c28db5e62e6c7b3c15d933af Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 18 Jun 2025 14:43:35 +0200 Subject: [PATCH] rebase on fricklerhandwerk/fix-deployment --- infra/common/nixos/hardware.nix | 2 +- infra/forgejo-ci/configuration.nix | 2 +- secrets/secrets.nix | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/infra/common/nixos/hardware.nix b/infra/common/nixos/hardware.nix index 580f9526..617f40e4 100644 --- a/infra/common/nixos/hardware.nix +++ b/infra/common/nixos/hardware.nix @@ -13,7 +13,7 @@ in }; } - (mkIf config.procolixVm.isQemuVm { + (mkIf config.fediversityVm.isQemuVm { boot.initrd = { availableKernelModules = [ diff --git a/infra/forgejo-ci/configuration.nix b/infra/forgejo-ci/configuration.nix index 84a72b97..46050ce1 100644 --- a/infra/forgejo-ci/configuration.nix +++ b/infra/forgejo-ci/configuration.nix @@ -11,7 +11,7 @@ in ./forgejo-actions-runner.nix ]; - procolixVm = { + fediversityVm = { name = "forgejo-ci"; domain = "procolix.com"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 0af27917..88d1bb03 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,10 +26,7 @@ concatMapAttrs { forgejo-database-password = [ vm02116 ]; forgejo-email-password = [ vm02116 ]; - forgejo-runner-token = [ - fedi300 - forgejo-ci - ]; + forgejo-runner-token = [ forgejo-ci ]; panel-secret-key = [ fedi201 ]; panel-ssh-key = [ fedi201 ]; wiki-basicauth-htpasswd = [ vm02187 ];