[nixpkgs] update

doc/src/module/initssh.md

@@ -26,14 +26,4 @@ Run ` lspci -k | grep -iA4 ethernet `
 ` [ ] `
 
 *Example:*
-`[ "r8169" ]`
-
-## cfg.ip
-
-I hate DHCP! Set static ip or ip = hosts.malobeo.hosts.${hostname}.network.address;
-
-*Default:*
-`Null` - Will error when not set
-
-*Example:*
-`hosts.malobeo.hosts.fanny.network.address;`
+`[ "r8169" ]`

flake.lock

@@ -264,11 +264,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1788187754,
-        "narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
+        "lastModified": 1792615934,
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
         "type": "github"
       },
       "original": {
@@ -568,11 +568,11 @@
         "utils": "utils_4"
       },
       "locked": {
-        "lastModified": 1789131197,
-        "narHash": "sha256-gpjhy2mIBt89oCVzoSXy8AgfAKjJ9Fi3u01CX09UTF4=",
+        "lastModified": 1792488750,
+        "narHash": "sha256-VLBpNctawQ+Yd03hkfhNPUqQVXNCc7bc6Qhu7mwJvKM=",
         "ref": "refs/heads/master",
-        "rev": "38bcceb0e8b84d6dcd50d05683c71eea8d410479",
-        "revCount": 161,
+        "rev": "7a8b9d4f3522c68cd15b21a1ec093c8c441775bf",
+        "revCount": 162,
         "type": "git",
         "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
       },

machines/albert/configuration.nix

@@ -72,7 +72,6 @@ in
     enable = true;
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["e1000e"];
-    ip = hosts.malobeo.hosts.albert.network.address;
   };
 
   services.malobeo.vpn = {

machines/albert/hydra.nix

@@ -20,6 +20,7 @@
 
   services.malobeo.gitea-translator = {
     enable = true;
+    host = "0.0.0.0";
   };
 
   services.hydra = {

machines/bakunin/configuration.nix

@@ -2,8 +2,6 @@
 
 let
   sshKeys = import ../ssh_keys.nix;
-  hosts = import ../hosts.nix {};
-
 in
 {
   imports =
@@ -37,7 +35,6 @@ in
     enable = true;
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["r8169"];
-    ip = hosts.malobeo.hosts.bakunin.network.address;
   };
 
   malobeo.users.malobeo = true;

machines/fanny/configuration.nix

@@ -90,7 +90,6 @@ in
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["r8169"];
     zfsExtraPools = [ "storage" ];
-    ip = hosts.malobeo.hosts.fanny.network.address;
   };
 
   boot.initrd = {
@@ -264,7 +263,7 @@ in
           client_body_in_file_only clean;
           client_body_buffer_size 32K;
           
-          client_max_body_size 50M;
+          client_max_body_size 500M;
           
           sendfile on;
           send_timeout 300s;

machines/modules/malobeo/initssh.nix

@@ -27,10 +27,6 @@ in
       default = [ ];
       description = "Name or GUID of extra ZFS pools that you wish to import during boot.";
     };
-    ip = lib.mkOption {
-      type = lib.types.str;
-      description = "The requested static ip for the machine";
-    };
   };
   
   config = lib.mkIf (cfg.enable && config.malobeo.disks.encryption) {
@@ -77,7 +73,7 @@ in
           "/etc/ssh/initrd" = "/etc/ssh/initrd";
         };
       };
-      kernelParams = [ "ip=${cfg.ip}::::${hostName}::" ];
+      kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ];
     };
   };
 }

machines/overwatch/configuration.nix

@@ -145,6 +145,7 @@ in
             "https://keys.malobeo.org"
             "https://tasklist.malobeo.org"
             "https://zines.malobeo.org"
+            "http://${hosts.malobeo.hosts.albert.network.address}:27364/health"
            ];
         }];
 
@@ -263,6 +264,12 @@ in
           targets = [ "${hosts.malobeo.hosts.albert.network.address}:9002" ];
         }];
       }
+      {
+        job_name = "wordpress";
+        static_configs = [{
+          targets = [ "${hosts.malobeo.hosts.wordpress.network.address}:9002" ];
+        }];
+      }
       # add vpn - check how to reach it first. most probably 10.100.0.1
     ];
   };

machines/wordpress/configuration.nix

@@ -23,10 +23,17 @@ in {
   };
 
   imports = [
+    inputs.malobeo.nixosModules.malobeo.metrics
     inputs.self.nixosModules.malobeo.users
     ../modules/sshd.nix
   ];
 
+  malobeo.metrics = {
+    enable = true;
+    enablePromtail = true;
+    logNginx = true;
+  };
+
   malobeo.users = {
     malobeo = false;
     admin = true;

scripts/gitea_hydra_server.py

@@ -26,7 +26,7 @@ def _parse_response(baseurl, owner, repo):
     return pulls
 
 class PullsHandler(BaseHTTPRequestHandler):
-    _VALID_PATHS={"/", "/gitea-pulls-sorted.json"}
+    _VALID_PATHS={"/", "/gitea-pulls-sorted.json", "/health"}
 
     # Class variables to store configuration
     baseurl = None
@@ -34,6 +34,15 @@ class PullsHandler(BaseHTTPRequestHandler):
     repo = None
 
     def do_GET(self):
+        if self.path == "/health":
+            body=json.dumps({"status": "ok"}).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)
+            return
+
         if self.path not in self._VALID_PATHS:
             self.send_error(404, "Not Found")
             return