Grapevine on new domain

This commit is contained in:
Henry Hiles 2025-06-02 18:01:21 -04:00
parent 1796c2e264
commit 7d9b19e1e9
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 11 additions and 11 deletions

View file

@ -4,7 +4,7 @@
... ...
}: { }: {
services = let services = let
domain = "call.henryhiles.com"; domain = "call.federated.nexus";
in { in {
livekit = { livekit = {
enable = true; enable = true;
@ -23,8 +23,8 @@
respond /config.json `${builtins.toJSON { respond /config.json `${builtins.toJSON {
default_server_config = { default_server_config = {
"m.homeserver" = { "m.homeserver" = {
"base_url" = "https://matrix.henryhiles.com"; "base_url" = config.services.grapevine.settings.server_discovery.client.base_url;
"server_name" = "henryhiles.com"; "server_name" = config.services.grapevine.settings.server_name;
}; };
}; };
livekit.livekit_service_url = "https://${domain}/livekit"; livekit.livekit_service_url = "https://${domain}/livekit";

View file

@ -3,13 +3,13 @@
networking.firewall.allowedTCPPorts = [8448]; networking.firewall.allowedTCPPorts = [8448];
services = let services = let
domain = "matrix.henryhiles.com"; domain = "federated.nexus";
# socket = "/run/grapvine/socket"; subdomain = "matrix.${domain}";
in { in {
grapevine = { grapevine = {
enable = true; enable = true;
settings = { settings = {
server_name = "henryhiles.com"; server_name = domain;
database.backend = "rocksdb"; database.backend = "rocksdb";
federation = { federation = {
max_concurrent_requests = 10000; max_concurrent_requests = 10000;
@ -17,8 +17,8 @@
}; };
server_discovery = { server_discovery = {
server.authority = "${domain}:443"; server.authority = "${subdomain}:443";
client.base_url = "https://${domain}"; client.base_url = "https://${subdomain}";
}; };
listen = [ listen = [
@ -30,8 +30,8 @@
}; };
}; };
caddy.virtualHosts."${domain}" = { caddy.virtualHosts."${subdomain}" = {
serverAliases = ["${domain}:8448"]; serverAliases = ["${subdomain}:8448"];
extraConfig = "reverse_proxy 127.0.0.3:6167"; extraConfig = "reverse_proxy 127.0.0.3:6167";
}; };
}; };

View file

@ -1,5 +1,5 @@
with builtins; with builtins;
filter (line: isString line && stringLength line != 0) (split "\n" (readFile (fetchurl { filter (line: isString line && stringLength line != 0) (split "\n" (readFile (fetchurl {
url = "https://git.henryhiles.com/Henry-Hiles.keys"; url = "https://git.federated.nexus/Henry-Hiles.keys";
sha256 = "1k73c228rgzq7ymf5vaj6wfqzkqm6yzq5lq0syb7mzbrvngvr2jc"; sha256 = "1k73c228rgzq7ymf5vaj6wfqzkqm6yzq5lq0syb7mzbrvngvr2jc";
}))) })))