update hyperhive, move some settings
This commit is contained in:
parent
c5b6c7a809
commit
a695aa408b
3 changed files with 50 additions and 31 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -373,11 +373,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788095523,
|
||||
"narHash": "sha256-UwtknsxJg5tGtEeCBLPkjeQgbREf9FiPrruzz9RxGC4=",
|
||||
"lastModified": 1788113629,
|
||||
"narHash": "sha256-8aJW0wQK4zKA0XmpJQ8wNZNV5yiT1xuNI2ZR8wkdQqc=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "1e4399d49e86fa46a4ccc073af83097dd3e08508",
|
||||
"revCount": 4045,
|
||||
"rev": "f14056996e7317953145814a523b26dd3df6ce1c",
|
||||
"revCount": 4073,
|
||||
"type": "git",
|
||||
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./containers.nix
|
||||
./hardware.nix
|
||||
];
|
||||
|
||||
config =
|
||||
let
|
||||
gw = config.services.hyperhive.gateway;
|
||||
old = "forge.pr1ma.darkest.space";
|
||||
new = "forge.constellation.darkest.space";
|
||||
in
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my = {
|
||||
# keep-sorted start
|
||||
|
|
@ -67,22 +67,46 @@
|
|||
];
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
}
|
||||
|
||||
my.constellation-swarm = {
|
||||
enable = true;
|
||||
hiveName = "pr1ma";
|
||||
};
|
||||
services.hyperhive.enableAllLocalDefaults = true;
|
||||
services.nginx.enable = true;
|
||||
(
|
||||
let
|
||||
old = "forge.pr1ma.darkest.space";
|
||||
new = "forge.constellation.darkest.space";
|
||||
in
|
||||
{
|
||||
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
|
||||
# nothing ever reaches the redirect. The forge module drops it from
|
||||
# this list the moment you change `swarm.forge.domain`.
|
||||
services.hyperhive.gateway.localNames = [ old ];
|
||||
# DNS: the hive's resolver must still answer for the old name, or
|
||||
# nothing ever reaches the redirect. The forge module drops it from
|
||||
# this list the moment you change `swarm.forge.domain`.
|
||||
gateway.localNames = [ old ];
|
||||
};
|
||||
services.nginx.enable = true;
|
||||
|
||||
services.nginx.virtualHosts.${old} = (gw.lib.tlsFor old) // {
|
||||
listen = gw.lib.listen;
|
||||
locations."/".return = "301 https://${new}$request_uri";
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts.${old} =
|
||||
let
|
||||
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";
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
Loading…
Reference in a new issue