retry

fili/services/forgejo.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   cfg = config.services.forgejo;
   srv = cfg.settings.server;
@@ -6,7 +11,7 @@ in
 {
   sops.secrets.forgejo = {
     sopsFile = ../../secrets/forgejo.yaml;
-    key="email_password";
+    key = "email_password";
     format = "yaml";
   };
 
@@ -33,7 +38,7 @@ in
     lfs.enable = true;
     user = "forgejo";
     group = "forgejo";
-    repositoryRoot="/storage/storage/git";
+    repositoryRoot = "/storage/storage/git";
 
     database = {
       type = "postgres";
@@ -43,8 +48,8 @@ in
 
     settings = {
       DEFAULT = {
-        APP_NAME="jana's git server";
-        APP_SLOGAN="meow!";
+        APP_NAME = "jana's git server";
+        APP_SLOGAN = "meow!";
       };
       server = {
         DOMAIN = "git.donsz.nl";
@@ -62,7 +67,7 @@ in
         DEFAULT_ACTIONS_URL = "github";
       };
       repository = {
-        DEFAULT_PRIVATE="private";
+        DEFAULT_PRIVATE = "private";
       };
       mailer = {
         ENABLED = true;
@@ -74,19 +79,46 @@ in
     mailerPasswordFile = config.sops.secrets.forgejo.path;
   };
 
+  users.groups.forgejo-runner = { };
+  users.users.forgejo-runner = {
+    isSystemUser = true;
+    group = "forgejo-runner";
+  };
+
+  sops.secrets.forgejo-runner = {
+    sopsFile = ../../secrets/forgejo-runner.env;
+  };
+
   services.gitea-actions-runner = {
     package = pkgs.forgejo-runner;
 
     instances.fili = {
       enable = true;
       name = "forgejo-runner-01";
-      token = "SutcrCJ3ULoE5LBj9Tm8zkvTRDEJCpbvpe7FEJHC";
+      tokenFile = config.sops.secrets.forgejo-runner.path;
       url = "https://git.donsz.nl/";
       labels = [
-        "node-22:docker://node:22-bookworm"
-        "nixos-latest:docker://nixos/nix"
+        "nix:host"
+        "docker:docker://node:16-bullseye"
+        "ubuntu-latest:docker://node:16-bullseye"
+      ];
+      settings = { };
+
+      hostPackages = with pkgs; [
+        # default ones
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+
+        # used in deployments
+        lix
+        openssh
       ];
-      settings = {};
     };
   };