From 9e83b41773265c3e996591baab497ac1ea05489b Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Thu, 31 Oct 2024 10:57:42 +0530 Subject: [PATCH] wynne, rico2: cleanup action runners --- hosts/rico2/services/apps/forgejo-actions-runner.nix | 10 ++++++---- hosts/wynne/services/apps/forgejo.nix | 12 +++++++----- secrets.yaml | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/hosts/rico2/services/apps/forgejo-actions-runner.nix b/hosts/rico2/services/apps/forgejo-actions-runner.nix index 654853d..c64da53 100644 --- a/hosts/rico2/services/apps/forgejo-actions-runner.nix +++ b/hosts/rico2/services/apps/forgejo-actions-runner.nix @@ -9,12 +9,14 @@ services.gitea-actions-runner = { package = pkgs.forgejo-runner; instances = { - runner-arm64 = { + aarch64-runner = { enable = true; - name = "runner-arm64"; + name = "aarch64-runner"; labels = [ - "docker:docker://debian-stable" - "docker-arm64:docker://debian-stable" + "docker:docker://ubuntu:latest" + "aarch64-docker:docker://ubuntu:latest" + "linux:docker://ubuntu:latest" + "aarch64-linux:docker://ubuntu:latest" ]; tokenFile = config.sops.secrets."forgejo/runner_registration_token_file".path; url = "https://forge.acomputer.lol"; diff --git a/hosts/wynne/services/apps/forgejo.nix b/hosts/wynne/services/apps/forgejo.nix index 5691429..d523dc5 100644 --- a/hosts/wynne/services/apps/forgejo.nix +++ b/hosts/wynne/services/apps/forgejo.nix @@ -15,15 +15,17 @@ in gitea-actions-runner = { package = pkgs.forgejo-runner; instances = { - runner-x86_64 = { + x86_64-runner = { enable = true; - name = "runner-x86_64"; + name = "x86_64-runner"; labels = [ - "docker:docker://debian:stable" - "docker-amd64:docker://debian:stable" + "docker:docker://ubuntu:latest" + "x86_64-docker:docker://ubuntu:latest" + "linux:docker://ubuntu:latest" + "x86_64-linux:docker://ubuntu:latest" ]; tokenFile = config.sops.secrets."forgejo/runner_registration_token_file".path; - url = "https://forge.acomputer.lol"; + url = "https://${domainName}"; }; }; }; diff --git a/secrets.yaml b/secrets.yaml index 331d368..b699eef 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -25,7 +25,7 @@ matrix: caddy: env_file: ENC[AES256_GCM,data:PKtILX7o0D3rj78JXIXad9UcQz0ZiihXK1nY/kb08fh3i54hYrFyJyGt04b9mAufxTnhDV4=,iv:I/EtxopCFmRxgsGJIcFDufTiM1JyPPoIQkgKIDiCP24=,tag:5QlGMp839p9RYKB09tr61A==,type:str] forgejo: - runner_registration_token_file: ENC[AES256_GCM,data:1qcygLbFcUsVBFe+u60+NPR3owDqPVZq5CgBaNv/ANYsnAD8lmXZk5sweRl17w==,iv:V9hUhn8YCucrbEZ8i951wgxjWqdZSS3mcssH25nA3UQ=,tag:172vV/JJNNy9GnwPOFmwFQ==,type:str] + runner_registration_token_file: ENC[AES256_GCM,data:CM5hQEd1YHuCpzN6ZVGVzxRgQcUuq/KZ+o5JcB3kRAyVJVYjCyRfNPD2SA/ruw==,iv:L3tLN0C/d3lztvnBHyRzSFdkjtR8bnd5IrROGBSw/0E=,tag:R+o7E47DNvRr8S+hqR+v5w==,type:str] proton: layne: ENC[AES256_GCM,data:wAY2uoxjM1ubHzvwBfsgQzx+OLsno4Q/gP5XPiDPHwWy3IbmU14EhSH942mdjixRlHK2/T3l3NYqFSOm//8Ri9+GyfmJBcIKY/A8vgui0DbkGOb5+h7AKDoCwyUrredtCtFSWk5Hahl19BnJtoLEzmOjbF6su7P2PgAdpxlkWiiyR3ZVSC+PD/2KjdkgNSEXV8V7fxTSaiMqAYXiIqe33Kx5gKIVHPuHf8qrnKYQ92q2BUolpXpcg24FlbavjgmkTI3wCw9V/o/zo5lJnCzi8TSdVelJ5fOKDUA+8FemJcquYQ==,iv:dsbKPzNUAYnH1yaflxEAoKaTj+QtflkMdqAQqQQi418=,tag:jsSTKjmk6nTUfUAxcTsMtA==,type:str] sops: @@ -97,8 +97,8 @@ sops: YzdpTitkMHh6VUFtV2FodVF6OWJkTU0KBjC+esgHZ8hTWXwZ+cy4++jLP+gsruHM fmRDhvQu0MNHkjQ8q4VmwRVl10uc8CyTDFTuyDoAhvmnzXHtrg1wpA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-30T16:57:28Z" - mac: ENC[AES256_GCM,data:1DDFzIph4M7niRTgMsXzCT4rqM21cR7BQRDW/EWzYf8yICgk+myyf/Y07jUhL43B1t7HVhs2hxdQWjnwS2cSX6WehCxZywv6ELmVPEt+pGCFTO2oJEWDHbUWmYDkkp0dOzpiqUuB9ph8RTKpvpysMFwnJQVtBzbmPdDtbSq+QYw=,iv:5B858skFZEcUhAXO+4KR8yO20hosPqZA9C8s6TrCmww=,tag:IhfiWrrSZQk17k8ak4SenA==,type:str] + lastmodified: "2024-10-31T05:28:50Z" + mac: ENC[AES256_GCM,data:PbyhjXr/IZw+5q0PqTjXowHaiB31NjZzYpKhVV5s43+XrdMpVhcaqr9Gs7yTsqNsSc36uZ1YRymwYr8i+bF1k81lvDgyEr38Pl3vcEoIy+jNPaVnxXBRW6CL69cKfC058GmuPRYIyevorw3G3DtpLsCT5lGiMS9XedmBMf3rsw0=,iv:lHO27bURe7apOq/2KQXttou/OJMRM4uBrpqH26hBIDE=,tag:1ulMCx3/UCWCplUv+NJqNA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1