ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modules: services: matrix: refactor vhost

Browse source
This commit is contained in:
Bruno BELANYI 2023-09-28 15:28:11 +00:00
parent 085c563d75
commit 1425c42489
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/services/matrix/default.nix
View file

@ -13,6 +13,7 @@ let
federationPort = { public = 8448; private = 11338; }; federationPort = { public = 8448; private = 11338; };
clientPort = { public = 443; private = 11339; }; clientPort = { public = 443; private = 11339; };
domain = config.networking.domain; domain = config.networking.domain;
matrixDomain = "matrix.${domain}";
in in
{ {
options.my.services.matrix = with lib; { options.my.services.matrix = with lib; {
@ -52,7 +53,7 @@ in
settings = { settings = {
server_name = domain; server_name = domain;
public_baseurl = "https://matrix.${domain}"; public_baseurl = "https://${matrixDomain}";
enable_registration = false; enable_registration = false;
@ -98,7 +99,7 @@ in
conf = { conf = {
default_server_config = { default_server_config = {
"m.homeserver" = { "m.homeserver" = {
"base_url" = "https://matrix.${domain}"; "base_url" = "https://${matrixDomain}";
"server_name" = domain; "server_name" = domain;
}; };
"m.identity_server" = { "m.identity_server" = {
@ -120,7 +121,7 @@ in
# Those are too complicated to use my wrapper... # Those are too complicated to use my wrapper...
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"matrix.${domain}" = { ${matrixDomain} = {
onlySSL = true; onlySSL = true;
useACMEHost = domain; useACMEHost = domain;
@ -148,9 +149,9 @@ in
}; };
# same as above, but listening on the federation port # same as above, but listening on the federation port
"matrix.${domain}_federation" = { "${matrixDomain}_federation" = {
onlySSL = true; onlySSL = true;
serverName = "matrix.${domain}"; serverName = matrixDomain;
useACMEHost = domain; useACMEHost = domain;
locations."/".return = "404"; locations."/".return = "404";
@ -171,7 +172,7 @@ in
locations."= /.well-known/matrix/server".extraConfig = locations."= /.well-known/matrix/server".extraConfig =
let let
server = { "m.server" = "matrix.${domain}:${toString federationPort.public}"; }; server = { "m.server" = "${matrixDomain}:${toString federationPort.public}"; };
in in
'' ''
add_header Content-Type application/json; add_header Content-Type application/json;
@ -181,7 +182,7 @@ in
locations."= /.well-known/matrix/client".extraConfig = locations."= /.well-known/matrix/client".extraConfig =
let let
client = { client = {
"m.homeserver" = { "base_url" = "https://matrix.${domain}"; }; "m.homeserver" = { "base_url" = "https://${matrixDomain}"; };
"m.identity_server" = { "base_url" = "https://vector.im"; }; "m.identity_server" = { "base_url" = "https://vector.im"; };
}; };
# ACAO required to allow element-web on any URL to request this json file # ACAO required to allow element-web on any URL to request this json file