modules/nixos/services/gitea-runner.nix

@@ -31,11 +31,6 @@
       tokenFile = config.secrets.giteaRunnerToken.dest;
     };
 
-    # Make sure the runner doesn't start until after Gitea
-    systemd.services."gitea-runner-${config.networking.hostName}".after =
-      [ "gitea.service" ];
-
-    # API key needed to connect to Gitea
     secrets.giteaRunnerToken = {
       source = ../../../private/gitea-runner-token.age; # TOKEN=xyz
       dest = "${config.secretsDirectory}/gitea-runner-token";

modules/nixos/services/gitea.nix

@@ -9,7 +9,6 @@ in {
       database.type = "sqlite3";
       settings = {
         actions.ENABLED = true;
-        metrics.ENABLED = true;
         repository = {
           DEFAULT_PUSH_CREATE_PRIVATE = true;
           DISABLE_HTTP_GIT = false;
@@ -38,36 +37,13 @@ in {
     networking.firewall.allowedTCPPorts = [ 122 ];
     users.users.${config.user}.extraGroups = [ "gitea" ];
 
-    caddy.routes = [
+    caddy.routes = [{
-      {
-        match = [{
-          host = [ config.hostnames.git ];
-          path = [ "/metrics*" ];
-        }];
-        handle = [{
-          handler = "static_response";
-          status_code = "403";
-        }];
-      }
-      {
       match = [{ host = [ config.hostnames.git ]; }];
       handle = [{
         handler = "reverse_proxy";
-          upstreams = [{
+        upstreams = [{ dial = "localhost:3001"; }];
-            dial = "localhost:${
-                builtins.toString
-                config.services.gitea.settings.server.HTTP_PORT
-              }";
       }];
     }];
-      }
-    ];
-
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.gitea.settings.server.HTTP_PORT
-      }"
-    ];
 
     ## Backup config