use nixpkgs#548367
This commit is contained in:
parent
dc626aa1bb
commit
b0d928d0f2
3 changed files with 31 additions and 3 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -9,6 +10,10 @@ let
|
||||||
lkJwtServiceDomain = "lk-jwt.call.federated.nexus";
|
lkJwtServiceDomain = "lk-jwt.call.federated.nexus";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# TODO: remove once https://github.com/NixOS/nixpkgs/pull/548367 is merged
|
||||||
|
disabledModules = [ "services/matrix/lk-jwt-service.nix" ];
|
||||||
|
imports = [ inputs.lk-jwt-service-module.outPath ];
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
livekit.serviceConfig.Restart = lib.mkForce "always";
|
livekit.serviceConfig.Restart = lib.mkForce "always";
|
||||||
lk-jwt-service.serviceConfig.Restart = lib.mkForce "always";
|
lk-jwt-service.serviceConfig.Restart = lib.mkForce "always";
|
||||||
|
|
@ -31,13 +36,18 @@ in
|
||||||
|
|
||||||
lk-jwt-service = {
|
lk-jwt-service = {
|
||||||
enable = true;
|
enable = true;
|
||||||
livekitUrl = "wss://${livekitDomain}";
|
environment = {
|
||||||
keyFile = config.services.livekit.keyFile;
|
LIVEKIT_URL = "wss://${livekitDomain}";
|
||||||
|
LIVEKIT_KEY_FILE = config.services.livekit.keyFile;
|
||||||
|
LIVEKIT_JWT_BIND = "127.0.0.4:8080";
|
||||||
|
LIVEKIT_FULL_ACCESS_HOMESERVERS = [ "federated.nexus" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
caddy.virtualHosts = {
|
caddy.virtualHosts = {
|
||||||
"${livekitDomain}".extraConfig = "reverse_proxy 127.0.0.1:7880";
|
"${livekitDomain}".extraConfig = "reverse_proxy 127.0.0.1:7880";
|
||||||
"${lkJwtServiceDomain}".extraConfig = "reverse_proxy 127.0.0.1:8080";
|
"${lkJwtServiceDomain}".extraConfig =
|
||||||
|
"reverse_proxy ${config.services.lk-jwt-service.environment.LIVEKIT_JWT_BIND}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
13
flake.lock
generated
13
flake.lock
generated
|
|
@ -738,6 +738,18 @@
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy"
|
"url": "https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"lk-jwt-service-module": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"narHash": "sha256-UkmiOkQFrQTzbPK3mjyobI9WnYB2zruLiMOgLYY/V40=",
|
||||||
|
"type": "file",
|
||||||
|
"url": "https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "file",
|
||||||
|
"url": "https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix"
|
||||||
|
}
|
||||||
|
},
|
||||||
"matrixoidc": {
|
"matrixoidc": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_7",
|
"flake-parts": "flake-parts_7",
|
||||||
|
|
@ -1079,6 +1091,7 @@
|
||||||
"flake-parts": "flake-parts_5",
|
"flake-parts": "flake-parts_5",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lasuite-docs-proxy": "lasuite-docs-proxy",
|
"lasuite-docs-proxy": "lasuite-docs-proxy",
|
||||||
|
"lk-jwt-service-module": "lk-jwt-service-module",
|
||||||
"matrixoidc": "matrixoidc",
|
"matrixoidc": "matrixoidc",
|
||||||
"nexus": "nexus",
|
"nexus": "nexus",
|
||||||
"nexusbot": "nexusbot",
|
"nexusbot": "nexusbot",
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,11 @@
|
||||||
url = "github:Silvenga/redlib";
|
url = "github:Silvenga/redlib";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
# TODO: remove once https://github.com/NixOS/nixpkgs/pull/548367 is merged
|
||||||
|
lk-jwt-service-module = {
|
||||||
|
url = "file+https://raw.githubusercontent.com/j0hax/nixpkgs/lk-jwt-service-restructure/nixos/modules/services/matrix/lk-jwt-service.nix";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue