Update flake.lock

This reverts commit 20781b3b73.

.hydra/declarative-jobsets.nix

@@ -14,32 +14,10 @@ let
     emailoverride = "";
     keepnr = 1;
     type = 1;
-    flake = "${info.head.repo.html_url}/archive/${info.head.ref}.tar.gz";
-    inputs = {
-      gitea_repo_name = {
-        type = "string";
-        value = "${info.head.repo.name}";
-        emailresponsible = false;
-      };
-      gitea_repo_owner = {
-        type = "string";
-        value = "${info.head.repo.owner.username}";
-        emailresponsible = false;
-      };
-      gitea_http_url = {
-        type = "string";
-        value = "https://git.dynamicdiscord.de";
-        emailresponsible = false;
-      };
-      gitea_status_repo = {
-        type = "string";
-        value = "${info.head.ref}";
-        emailresponsible = false;
-      };
-    };
+    flake = "gitea:git.dynamicdiscord.de/ahtlon/infrastructure/pulls/${num}";
   }) prs;
   mkFlakeJobset = branch: {
-    description = "Build ${branch} branch of the Malobeo Infrastructure repo";
+    description = "Build ${branch} branch of Simple NixOS MailServer";
     checkinterval = 300;
     enabled = "1";
     schedulingshares = 100;
@@ -48,7 +26,7 @@ let
     keepnr = 3;
     hidden = false;
     type = 1;
-    flake = "https://git.dynamicdiscord.de/malobeo/infrastructure/archive/${branch}.tar.gz";
+    flake = "git:simple-nixos-mailserver/nixos-mailserver/${branch}";
   };
 
   desc = prJobsets // {

.hydra/spec.json

@@ -1,18 +1,18 @@
 {
   "enabled": 1,
   "hidden": false,
-  "description": "Malobeo infrastructure repo",
+  "description": "Simple NixOS Mailserver",
   "nixexprinput": "nixexpr",
   "nixexprpath": ".hydra/declarative-jobsets.nix",
   "checkinterval": 60,
   "schedulingshares": 100,
   "enableemail": false,
   "emailoverride": "",
-  "keepnr": 5,
+  "keepnr": 3,
   "type": 0,
   "inputs": {
     "nixexpr": {
-      "value": "https://git.dynamicdiscord.de/malobeo/infrastructure master",
+      "value": "https://git.dynamicdiscord.de/ahtlon/infrastructure master",
       "type": "git",
       "emailresponsible": false
     },

doc/src/SUMMARY.md

@@ -12,7 +12,6 @@
             - [musik](./projekte/musik.md)
         - [TODO](./todo.md)
         - [Modules]()
-            - [Gitea-translator](./module/gitea-translator.md)
             - [Initrd-ssh](./module/initssh.md)
             - [Disks](./module/disks.md)
     - [How-to]()

doc/src/module/gitea-translator.md

@@ -1,21 +0,0 @@
-# Gitea-tanslator
-The module can be used by importing `inputs.self.nixosModules.malobeo.gitea-translator`
-
-This module starts a python server that fetches the gitea pull request api and translates it to a file that hydra understands.   
-To use, just set the parameters of the gitea server, then send a GET request to either `http://${host}:${port}/` or `http://${host}:${port}/gitea-pulls-sorted.json`
-
-## Module config
-##### enable (default = false) - enables the module  
-##### baseurl (default = "git.dynamicdiscord.de") - Base URL of the Gitea instance   
-##### owner (default = "malobeo") - Repository owner   
-##### repo (default = "infrastructure") - Repository name   
-##### host (default = "127.0.0.1") - Address the server binds to   
-##### port (default = 27364) - Port the server listens on   
-
-## Hydra config
-If you change the default port or host, the file `.hydra/spec.json` has to be modified accordingly.
-With the module running on the hydra host, create a new hydra project, then:
-
-    - Set `Declarative spec file` to `.hydra/spec.json`
-    - Change declaritive input type to `Git checkout`
-    - Set your git repo location in the field below that

flake.lock

@@ -126,11 +126,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1772055583,
-        "narHash": "sha256-iPIm1orqkhsxqju6EVODOrV1BmyA5HNTZ8a1o812bFM=",
+        "lastModified": 1773018425,
+        "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "f6dcfb7c16cc3775536c825dc0698d4ede13d063",
+        "rev": "25ebda3c558e923720c965832dc9a04f559a055c",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1771969195,
-        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "lastModified": 1772972630,
+        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1771848320,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "lastModified": 1772963539,
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
         "type": "github"
       },
       "original": {
@@ -225,11 +225,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1771903837,
-        "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
+        "lastModified": 1773068389,
+        "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
+        "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772048434,
-        "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=",
+        "lastModified": 1773096132,
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1759482047,
-        "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=",
+        "lastModified": 1772189877,
+        "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=",
         "ref": "refs/heads/main",
-        "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9",
-        "revCount": 996,
+        "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358",
+        "revCount": 1255,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

machines/modules/malobeo/gitea_translator.nix

@@ -1,78 +0,0 @@
-{ config, self, lib, inputs, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.malobeo.gitea-translator;
-in
-{
-  options = {
-    services.malobeo.gitea-translator = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = lib.mdDoc "Start a webserver for hydra to use the gitea pull request api.";
-      };
-
-      baseurl = mkOption {
-        type = types.str;
-        default = "git.dynamicdiscord.de";
-        description = lib.mdDoc "Base URL of the Gitea instance.";
-      };
-
-      owner = mkOption {
-        type = types.str;
-        default = "malobeo";
-        description = lib.mdDoc "Repository owner on the Gitea instance.";
-      };
-
-      repo = mkOption {
-        type = types.str;
-        default = "infrastructure";
-        description = lib.mdDoc "Repository name on the Gitea instance.";
-      };
-
-      host = mkOption {
-        type = types.str;
-        default = "127.0.0.1";
-        description = lib.mdDoc "Address the server binds to.";
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = 27364;
-        description = lib.mdDoc "Port the server listens on.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.gitea-translator = {
-      description = "Gitea Pull Request Translator for Hydra";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        ExecStart = ''
-          ${pkgs.python3}/bin/python3 ${../../../scripts/gitea_hydra_server.py} \
-            --baseurl ${cfg.baseurl} \
-            --owner ${cfg.owner} \
-            --repo ${cfg.repo} \
-            --host ${cfg.host} \
-            --port ${toString cfg.port}
-        '';
-        Restart = "on-failure";
-        RestartSec = 5;
-
-        # Hardening because why not 
-        DynamicUser = true;
-        NoNewPrivileges = true;
-        ProtectSystem = "strict";
-        ProtectHome = true;
-        PrivateTmp = true;
-        PrivateDevices = true;
-      };
-    };
-  };
-}

outputs.nix

@@ -118,7 +118,6 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       users.imports = [ ./machines/modules/malobeo/users.nix ];
       backup.imports = [ ./machines/modules/malobeo/backup.nix ];
       printing.imports = [ ./machines/modules/malobeo/printing.nix ];
-      gitea-translator.imports = [ ./machines/modules/malobeo/gitea_translator.nix ];
     };
 
     hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (

scripts/gitea_hydra_server.py

@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-
-#imports
-import os
-import json
-import argparse
-from http.server import BaseHTTPRequestHandler, HTTPServer
-import urllib.request
-
-def _get_api_response(baseurl, owner, repo):
-    ###https://docs.gitea.com/api/1.21/#tag/repository/operation/repoListPullRequests
-    ###GET /api/v1/repos/{owner}/{repo}/pulls
-    url=(f"https://{baseurl}/api/v1/repos/{owner}/{repo}/pulls?state=open")
-    headers={"Accept": "application/json"}
-    req=urllib.request.Request(url, headers=headers)
-    with urllib.request.urlopen(req) as resp:
-        return json.loads(resp.read().decode("utf-8"))
-
-def _parse_response(baseurl, owner, repo):
-    target_repo_url=f"https://{baseurl}/{owner}/{repo}.git"
-    pulls: dict={}
-    response=_get_api_response(baseurl, owner, repo)
-    for pr in response:
-        pr["target_repo_url"]=target_repo_url
-        pulls[str(pr["number"])]=pr
-    return pulls
-
-class PullsHandler(BaseHTTPRequestHandler):
-    _VALID_PATHS={"/", "/gitea-pulls-sorted.json"}
-
-    # Class variables to store configuration
-    baseurl = None
-    owner = None
-    repo = None
-
-    def do_GET(self):
-        if self.path not in self._VALID_PATHS:
-            self.send_error(404, "Not Found")
-            return
-
-        answer=dict(_parse_response(self.baseurl, self.owner, self.repo))
-
-        body=json.dumps(answer, indent=2, sort_keys=True).encode("utf-8")
-
-        self.send_response(200)
-        self.send_header("Content-Type", "application/json; charset=utf-8")
-        self.send_header("Content-Length", str(len(body)))
-        self.end_headers()
-        self.wfile.write(body)
-
-    def log_message(self, fmt, *args):
-        print(
-            f"[gitea-translator] {self.address_string()} - {fmt % args}",
-            flush=True,
-        )
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Hydra Server to Gitea-pull-request translator"
-    )
-    parser.add_argument(
-        "--baseurl",
-        default="git.dynamicdiscord.de",
-        help="Base URL of Gitea instance (default: git.dynamicdiscord.de)"
-    )
-    parser.add_argument(
-        "--owner",
-        default="malobeo",
-        help="Repository owner (default: malobeo)"
-    )
-    parser.add_argument(
-        "--repo",
-        default="infrastructure",
-        help="Repository name (default: infrastructure)"
-    )
-    parser.add_argument(
-        "--host",
-        default="127.0.0.1",
-        help="Host to bind to (default: 127.0.0.1)"
-    )
-    parser.add_argument(
-        "--port",
-        type=int,
-        default=27364,
-        help="Port to bind to (default: 27364)"
-    )
-
-    args = parser.parse_args()
-
-    # Set class variables so they're accessible in request handlers
-    PullsHandler.baseurl = args.baseurl
-    PullsHandler.owner = args.owner
-    PullsHandler.repo = args.repo
-
-    print(
-        f"[gitea-translator] Starting, pulling from {args.baseurl}/{args.owner}/{args.repo}",
-        flush=True,
-    )
-    server=HTTPServer((args.host, args.port), PullsHandler)
-    print(
-        f"[gitea-translator] online @ {args.host}:{args.port}",
-        flush=True,
-    )
-    server.serve_forever()
-
-if __name__ == "__main__":
-    main()