Compare commits
1 commit
74067ff782
...
6bbd0f0157
Author | SHA1 | Date | |
---|---|---|---|
6bbd0f0157 |
3 changed files with 7 additions and 7 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -223,10 +223,10 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727952204,
|
"lastModified": 1727954097,
|
||||||
"narHash": "sha256-+vL4SNcnwgFHH2XtzQ8MDzpqEulR9Bd3ENJsMlaePoA=",
|
"narHash": "sha256-Fmi1bGcyVLVMpSURwXnGCwWl5K0MVAJHuybDa/vYDis=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "4af699ae06b1a49b82f05b2474f4d761de42cfb7",
|
"rev": "1d096ecce6a9b722dbdc70515375ec6798958c23",
|
||||||
"revCount": 6,
|
"revCount": 6,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:./private"
|
"url": "file:./private"
|
||||||
|
|
|
@ -30,7 +30,7 @@ with lib;
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
{
|
{
|
||||||
|
|
||||||
sops.secrets."forgejo/runner-token".restartUnits = [
|
sops.secrets."forgejo/runner-registration-token".restartUnits = [
|
||||||
"gitea-runner-${defaultInstanceName}.service"
|
"gitea-runner-${defaultInstanceName}.service"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ with lib;
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "${config.networking.hostName}-${defaultInstanceName}";
|
name = "${config.networking.hostName}-${defaultInstanceName}";
|
||||||
url = "https://${cfg.domain}";
|
url = "https://${cfg.domain}";
|
||||||
tokenFile = config.sops.secrets."forgejo/runner-token".path;
|
tokenFile = config.sops.secrets."forgejo/runner-registration-token".path;
|
||||||
labels = [
|
labels = [
|
||||||
"ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
|
"ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
|
||||||
"ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04"
|
"ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04"
|
||||||
|
@ -261,7 +261,7 @@ with lib;
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "${config.networking.hostName}-${name}";
|
name = "${config.networking.hostName}-${name}";
|
||||||
url = "https://${cfg.domain}";
|
url = "https://${cfg.domain}";
|
||||||
tokenFile = config.sops.secrets."forgejo/runner-token".path;
|
tokenFile = config.sops.secrets."forgejo/runner-registration-token".path;
|
||||||
labels = [ "nix:docker://gitea-runner-nix" ];
|
labels = [ "nix:docker://gitea-runner-nix" ];
|
||||||
settings = {
|
settings = {
|
||||||
container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
|
container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm";
|
||||||
|
|
2
private
2
private
|
@ -1 +1 @@
|
||||||
Subproject commit 4af699ae06b1a49b82f05b2474f4d761de42cfb7
|
Subproject commit 1d096ecce6a9b722dbdc70515375ec6798958c23
|
Loading…
Add table
Reference in a new issue