update hyperhive, move some settings

flake.lock

@@ -373,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788095523,
+        "lastModified": 1788113629,
-        "narHash": "sha256-UwtknsxJg5tGtEeCBLPkjeQgbREf9FiPrruzz9RxGC4=",
+        "narHash": "sha256-8aJW0wQK4zKA0XmpJQ8wNZNV5yiT1xuNI2ZR8wkdQqc=",
         "ref": "refs/heads/main",
-        "rev": "1e4399d49e86fa46a4ccc073af83097dd3e08508",
+        "rev": "f14056996e7317953145814a523b26dd3df6ce1c",
-        "revCount": 4045,
+        "revCount": 4073,
         "type": "git",
         "url": "https://forge.darkest.space/hyperhive/hyperhive.git"
       },

nixosConfigurations/muede-lpt2/default.nix

@@ -1,16 +1,16 @@
-{ pkgs, config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 {
   imports = [
     ./containers.nix
     ./hardware.nix
   ];
 
-  config =
+  config = lib.mkMerge [
-    let
-      gw = config.services.hyperhive.gateway;
-      old = "forge.pr1ma.darkest.space";
-      new = "forge.constellation.darkest.space";
-    in
     {
       my = {
         # keep-sorted start
@@ -67,22 +67,46 @@
       ];
 
       boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+    }
 
-      my.constellation-swarm = {
+    (
-        enable = true;
+      let
-        hiveName = "pr1ma";
+        old = "forge.pr1ma.darkest.space";
-      };
+        new = "forge.constellation.darkest.space";
-      services.hyperhive.enableAllLocalDefaults = true;
+      in
-      services.nginx.enable = true;
+      {
+        my.constellation-swarm = {
+          enable = true;
+          hiveName = "pr1ma";
+        };
+        services.hyperhive = {
+          deploy = {
+            singleHostSwarm = true;
+            forgejo.ci = {
+              enable = true;
+              concurrency = 2;
+            };
+          };
 
-      # DNS: the hive's resolver must still answer for the old name, or
+          # DNS: the hive's resolver must still answer for the old name, or
-      # nothing ever reaches the redirect. The forge module drops it from
+          # nothing ever reaches the redirect. The forge module drops it from
-      # this list the moment you change `swarm.forge.domain`.
+          # this list the moment you change `swarm.forge.domain`.
-      services.hyperhive.gateway.localNames = [ old ];
+          gateway.localNames = [ old ];
+        };
+        services.nginx.enable = true;
 
-      services.nginx.virtualHosts.${old} = (gw.lib.tlsFor old) // {
+        services.nginx.virtualHosts.${old} =
-        listen = gw.lib.listen;
+          let
-        locations."/".return = "301 https://${new}$request_uri";
+            gw = config.services.hyperhive.gateway;
-      };
+          in
-    };
+          (gw.lib.tlsFor old)
+          // {
+            listen = gw.lib.listen;
+            locations."/".return = "301 https://${new}$request_uri";
+          };
+
+        #containers.swarm-authelia.config.services.authelia.instances.swarm.settings.log.level =lib.mkForce "debug";
+      }
+    )
+  ];
 }

nixosModules/constellation-swarm.nix

@@ -36,11 +36,6 @@ in
     swarm = {
       name = "constellation";
       domain = "constellation.darkest.space";
-      enableRequiredServices = true;
-      forge.ci = {
-        enable = true;
-        concurrency = 2;
-      };
       matrix = {
         # not default - both still on hive domain
         gatewayHost = "matrix.pr1ma.darkest.space";