diff --git a/common/server/gitea-runner.nix b/common/server/gitea-runner.nix index f5f4a17..b57b056 100644 --- a/common/server/gitea-runner.nix +++ b/common/server/gitea-runner.nix @@ -11,12 +11,6 @@ in type = lib.types.str; description = lib.mdDoc "gitea runner data directory."; }; - instanceUrl = lib.mkOption { - type = lib.types.str; - }; - registrationTokenFile = lib.mkOption { - type = lib.types.path; - }; }; config = lib.mkIf cfg.enable { @@ -35,13 +29,6 @@ in }; users.groups.gitea-runner = { }; - # registration token - services.gitea-runner.registrationTokenFile = "/run/agenix/gitea-runner-registration-token"; - age.secrets.gitea-runner-registration-token = { - file = ../../secrets/gitea-runner-registration-token.age; - owner = "gitea-runner"; - }; - systemd.services.gitea-runner = { description = "Gitea Runner"; @@ -57,40 +44,7 @@ in path = with pkgs; [ gitea-actions-runner ]; - # based on https://gitea.com/gitea/act_runner/src/branch/main/run.sh script = '' - . ${cfg.registrationTokenFile} - - if [[ ! -s .runner ]]; then - try=$((try + 1)) - success=0 - - LOGFILE="$(mktemp)" - - # The point of this loop is to make it simple, when running both act_runner and gitea in docker, - # for the act_runner to wait a moment for gitea to become available before erroring out. Within - # the context of a single docker-compose, something similar could be done via healthchecks, but - # this is more flexible. - while [[ $success -eq 0 ]] && [[ $try -lt ''${10:-10} ]]; do - act_runner register \ - --instance "${cfg.instanceUrl}" \ - --token "$GITEA_RUNNER_REGISTRATION_TOKEN" \ - --name "${config.networking.hostName}" \ - --no-interactive > $LOGFILE 2>&1 - - cat $LOGFILE - - cat $LOGFILE | grep 'Runner registered successfully' > /dev/null - if [[ $? -eq 0 ]]; then - echo "SUCCESS" - success=1 - else - echo "Waiting to retry ..." - sleep 5 - fi - done - fi - exec act_runner daemon ''; }; diff --git a/machines/phil/default.nix b/machines/phil/default.nix index d6a0211..10e299f 100644 --- a/machines/phil/default.nix +++ b/machines/phil/default.nix @@ -6,10 +6,5 @@ ]; networking.hostName = "phil"; - services.gitea-runner = { - enable = true; - instanceUrl = "https://git.neet.dev"; - }; - - boot.binfmt.emulatedSystems = [ "x86_64-linux" ]; + services.gitea-runner.enable = true; } diff --git a/machines/storage/s0/default.nix b/machines/storage/s0/default.nix index 024768e..845ba03 100644 --- a/machines/storage/s0/default.nix +++ b/machines/storage/s0/default.nix @@ -7,7 +7,12 @@ networking.hostName = "s0"; - system.autoUpgrade.enable = true; + # system.autoUpgrade.enable = true; + + # gitea runner and allow it to build ARM derivations + services.gitea-runner.enable = true; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache services.iperf3.enable = true; services.iperf3.openFirewall = true;