Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9029dcbb48 | ||
|
|
158ea8fc4c |
3 changed files with 77 additions and 66 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -373,11 +373,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787567814,
|
"lastModified": 1787762084,
|
||||||
"narHash": "sha256-8BSf34Trov63VbYt6eVoGspM381RsWANPMewm7BqKbA=",
|
"narHash": "sha256-UsnVAWB3cw6zdpO1cqO1IrskYZUbVYhSKritpKHBuWI=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "541dd298206648212d8a02e22bc9f81f9a926e05",
|
"rev": "d702eeffe16c5a93cd835bce5cec579211a4f09a",
|
||||||
"revCount": 3849,
|
"revCount": 3910,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
|
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,17 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./containers.nix
|
./containers.nix
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config =
|
||||||
|
let
|
||||||
|
gw = config.services.hyperhive.gateway;
|
||||||
|
old = "forge.pr1ma.darkest.space";
|
||||||
|
new = "forge.constellation.darkest.space";
|
||||||
|
in
|
||||||
|
{
|
||||||
my = {
|
my = {
|
||||||
# keep-sorted start
|
# keep-sorted start
|
||||||
intelGraphics.enable = true;
|
intelGraphics.enable = true;
|
||||||
|
|
@ -67,5 +73,16 @@
|
||||||
hiveName = "pr1ma";
|
hiveName = "pr1ma";
|
||||||
};
|
};
|
||||||
services.hyperhive.enableAllLocalDefaults = true;
|
services.hyperhive.enableAllLocalDefaults = true;
|
||||||
|
services.nginx.enable = true;
|
||||||
|
|
||||||
|
# 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 ];
|
||||||
|
|
||||||
|
services.nginx.virtualHosts.${old} = (gw.lib.tlsFor old) // {
|
||||||
|
listen = gw.lib.listen;
|
||||||
|
locations."/".return = "301 https://${new}$request_uri";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,20 +37,14 @@ in
|
||||||
name = "constellation";
|
name = "constellation";
|
||||||
domain = "constellation.darkest.space";
|
domain = "constellation.darkest.space";
|
||||||
enableRequiredServices = true;
|
enableRequiredServices = true;
|
||||||
forge = {
|
forge.ci = {
|
||||||
# not default - still on hive domain
|
|
||||||
domain = "forge.pr1ma.darkest.space";
|
|
||||||
ci = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
concurrency = 2;
|
concurrency = 2;
|
||||||
};
|
};
|
||||||
sso.enable = true;
|
|
||||||
};
|
|
||||||
matrix = {
|
matrix = {
|
||||||
# not default - both still on hive domain
|
# not default - both still on hive domain
|
||||||
gatewayHost = "matrix.pr1ma.darkest.space";
|
gatewayHost = "matrix.pr1ma.darkest.space";
|
||||||
serverName = "pr1ma.darkest.space";
|
serverName = "pr1ma.darkest.space";
|
||||||
sso.enable = true;
|
|
||||||
};
|
};
|
||||||
hives = {
|
hives = {
|
||||||
"umbra" = {
|
"umbra" = {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue