From 029d98b191c2f1a6dfcc145587187ee592975418 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 6 Aug 2025 09:03:06 +0200 Subject: [PATCH] mv to forgejo-ci --- machines/dev/fedi203/default.nix | 6 ------ machines/dev/forgejo-ci/default.nix | 1 + secrets/secrets.nix | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/machines/dev/fedi203/default.nix b/machines/dev/fedi203/default.nix index 0957b4a9..ad2e9d66 100644 --- a/machines/dev/fedi203/default.nix +++ b/machines/dev/fedi203/default.nix @@ -17,10 +17,4 @@ gateway = "2a00:51c0:13:1305::1"; }; }; - - nixos.module = { - imports = [ - ../forgejo-ci/woodpecker.nix - ]; - }; } diff --git a/machines/dev/forgejo-ci/default.nix b/machines/dev/forgejo-ci/default.nix index fc520136..c72d7ba6 100644 --- a/machines/dev/forgejo-ci/default.nix +++ b/machines/dev/forgejo-ci/default.nix @@ -40,6 +40,7 @@ in imports = [ ./forgejo-actions-runner.nix + ./woodpecker.nix ]; hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 18488e58..ffa9f89d 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -33,8 +33,8 @@ concatMapAttrs wiki-basicauth-htpasswd = [ vm02187 ]; wiki-password = [ vm02187 ]; wiki-smtp-password = [ vm02187 ]; - woodpecker-gitea-client = [ fedi203 ]; - woodpecker-gitea-secret = [ fedi203 ]; - woodpecker-agent-container = [ fedi203 ]; + woodpecker-gitea-client = [ forgejo-ci ]; + woodpecker-gitea-secret = [ forgejo-ci ]; + woodpecker-agent-container = [ forgejo-ci ]; } )