From b0828cda299d7c0e8c5341bb62a3571f720c2a42 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Wed, 30 Oct 2024 22:34:08 +0530 Subject: [PATCH] wynne, rico2: update forgejo action runners --- hosts/rico2/services/apps/forgejo-actions-runner.nix | 6 ++---- hosts/wynne/services/apps/forgejo.nix | 7 +++---- secrets.yaml | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hosts/rico2/services/apps/forgejo-actions-runner.nix b/hosts/rico2/services/apps/forgejo-actions-runner.nix index dda954c..654853d 100644 --- a/hosts/rico2/services/apps/forgejo-actions-runner.nix +++ b/hosts/rico2/services/apps/forgejo-actions-runner.nix @@ -13,10 +13,8 @@ enable = true; name = "runner-arm64"; labels = [ - "docker:docker://ubuntu:latest" - "debian-stable:docker://debian:stable" - "ubuntu:docker://ubuntu:latest" - "alpine:docker://alpine:latest" + "docker:docker://debian-stable" + "docker-arm64:docker://debian-stable" ]; 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 8523395..5691429 100644 --- a/hosts/wynne/services/apps/forgejo.nix +++ b/hosts/wynne/services/apps/forgejo.nix @@ -19,10 +19,8 @@ in enable = true; name = "runner-x86_64"; labels = [ - "docker:docker://ubuntu:latest" - "debian-stable:docker://debian:stable" - "ubuntu:docker://ubuntu:latest" - "alpine:docker://alpine:latest" + "docker:docker://debian:stable" + "docker-amd64:docker://debian:stable" ]; tokenFile = config.sops.secrets."forgejo/runner_registration_token_file".path; url = "https://forge.acomputer.lol"; @@ -31,6 +29,7 @@ in }; forgejo = { enable = true; + package = pkgs.forgejo; stateDir = "/mnt/data/Forgejo"; settings = { database = { diff --git a/secrets.yaml b/secrets.yaml index 4163fd1..331d368 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:LOSekKJdvqWklQbcuXwwmoCkfwE9Vm+QTj+KfC/02zL/SG64mESO+TrPtguMRQ==,iv:8rzddQomNqAMhEgxBPLD3nflVYu97vmGg+ZGcg2VDxE=,tag:labXqAQN3r0O4eVOL56+nQ==,type:str] + runner_registration_token_file: ENC[AES256_GCM,data:1qcygLbFcUsVBFe+u60+NPR3owDqPVZq5CgBaNv/ANYsnAD8lmXZk5sweRl17w==,iv:V9hUhn8YCucrbEZ8i951wgxjWqdZSS3mcssH25nA3UQ=,tag:172vV/JJNNy9GnwPOFmwFQ==,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-29T17:13:32Z" - mac: ENC[AES256_GCM,data:JCE044Syy2kuArn+kpsdGIS4clU2LJh8WtwNe+uimam6uJmBpx9EgwSQMCUKjPs1SsvzR8tOwSru705nax3pwZLqvSwFe98JaeIcp7eryVXGnJ1w5OldeYmCXttElnx7wg2w/LYRCcw6OPdA+zzhuMIxQn6OtQ0iB9a0YPh1H6E=,iv:n02q5fS3GFl1xvw0AyvaJtE+dtEekC7JAd5ctfZ75Aw=,tag:DPImMZOZKWwxRIbo2LJP2w==,type:str] + lastmodified: "2024-10-30T16:57:28Z" + mac: ENC[AES256_GCM,data:1DDFzIph4M7niRTgMsXzCT4rqM21cR7BQRDW/EWzYf8yICgk+myyf/Y07jUhL43B1t7HVhs2hxdQWjnwS2cSX6WehCxZywv6ELmVPEt+pGCFTO2oJEWDHbUWmYDkkp0dOzpiqUuB9ph8RTKpvpysMFwnJQVtBzbmPdDtbSq+QYw=,iv:5B858skFZEcUhAXO+4KR8yO20hosPqZA9C8s6TrCmww=,tag:IhfiWrrSZQk17k8ak4SenA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1