diff --git a/modules/nixos/forgejo.nix b/modules/nixos/forgejo.nix index 0c5c0ed..d414478 100644 --- a/modules/nixos/forgejo.nix +++ b/modules/nixos/forgejo.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + pkgs, + ... +}: let domain = "git.jankremer.de"; in @@ -9,7 +14,7 @@ in }; age.secrets.forgejo-runner = { file = ../../modules/secrets/forgejo-runner.age; - owner = "gitea-runner"; + owner = "forgejo"; }; services = { @@ -42,14 +47,17 @@ in }; }; - gitea-actions-runner.instances.nimbus = { - enable = true; - url = "https://${domain}"; - tokenFile = config.age.secrets.forgejo-runner.path; - name = "nimbus"; - labels = [ - "native:host" - ]; + gitea-actions-runner = { + package = pkgs.forgejo-runner; + instances.nimbus = { + enable = true; + name = config.networking.hostName; + url = "https://${domain}"; + tokenFile = config.age.secrets.forgejo-runner.path; + labels = [ + "native:host" + ]; + }; }; }; } diff --git a/modules/secrets/forgejo-runner.age b/modules/secrets/forgejo-runner.age index 93c2e94..5e43575 100644 --- a/modules/secrets/forgejo-runner.age +++ b/modules/secrets/forgejo-runner.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 2otpcg BKk+n4hh+NId35ZAUygwF8paTCY1Nbg3qo6MrTyOUwk -TiTl0BVeqXEXQ7y3ySDKDW2N0R3RAYzaPn1mvwM7W9k --> ssh-ed25519 40YjXQ Vk49T74+I5qs6dY4mXQeGFzHR6i75xthZYZ1Y/bsyHc -QqBkWmkarBoSc5zmFO67Hwck3d+BioL444RitOxsR4w --> ssh-ed25519 wbs2Dw NoJGVHAcH+PAoNQn+KCgwy/T14sHo+xYaGKvcTDHMUk -XFsOkgaXNQgkpKcmui1hbgywDRSIWtIAq7oFJI/LrjM ---- glH3vTvqZkaJqFLYGHPsNhu5Riyxjz0AKtMMnlaZYHo - hOjfXbؤ"6,!\X ssh-ed25519 2otpcg HTO8t+ZqnlhChqUC0KqZB7KMJh0jaHK1bR9h7Pb10Vo +iVcAjc+HD0uB2OJ6SV6Zow0nufxdASbra2cihsjsitU +-> ssh-ed25519 40YjXQ zFo0PpXhe1ZMPZk4RWdKYUXZXTQRV5WF3sDdVV7IJCg +84WAB8TPe59XSAxjUkKuyaR9xcpOmex1/ipV/McK5pQ +-> ssh-ed25519 wbs2Dw 2e8aoaR3nKEgyKO0Y6eTxU8s0TOaOIoaJVy70xNE6EA +HRe/AFMTBLlZGXNDiuEblwtjTu5XPbeyRwxYK91HHGA +--- yRJlc2yzL8d5H8tdcPzaDIXpA5tfEQVnHBkQmnwwW4s + s6z4޲:kY Ow^dflvJt>T Yi_͆]E?TbҎl. \ No newline at end of file