pub-solar/infra
6
1
Fork 3
Code Issues 24 Pull requests 9 Actions Packages Projects 1 Releases Wiki Activity

fix/add-matrix-wellknown #52

Merged
b12f merged 2 commits from fix/add-matrix-wellknown into main 2023-11-08 15:33:22 +00:00
Conversation 0 Commits 2 Files changed 1 +27 -6
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
hosts/nachtigall/apps/nginx-matrix.nix
View file

@ -6,8 +6,25 @@ let
add_header X-XSS-Protection "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
''; '';
clientConfig = import ./matrix/element-client-config.nix; clientConfig = import ./matrix/element-client-config.nix;
wellKnownClient."m.homeserver".base_url = "https://matrix.test.pub.solar"; wellKnownClient = {
wellKnownServer."m.server" = "matrix.test.pub.solar:8448"; "m.homeserver".base_url = "https://matrix.pub.solar";
"m.identity_server".base_url = "https://matrix.pub.solar";
teutat3s marked this conversation as resolved
teutat3s commented 2023-11-07 14:49:46 +00:00
Review
Copy link

This breaks federation for the testing domain that @axeman is working on. Can we have an extra nginx vhost for testing and the current matrix homeserver?

This breaks federation for the testing domain that @axeman is working on. Can we have an extra nginx vhost for testing and the current matrix homeserver?
b12f commented 2023-11-07 15:18:47 +00:00
Review
Copy link

I don't see this currently actively being worked on, so I'd rather that gets added/changed in a separate Pr so we get this merged

I don't see this currently actively being worked on, so I'd rather that gets added/changed in a separate Pr so we get this merged
teutat3s commented 2023-11-07 22:33:31 +00:00
Review
Copy link

Okay then @axeman will have to add this back 👍

Okay then @axeman will have to add this back 👍
❤️ 1
"im.vector.riot.e2ee".default = true;
"io.element.e2ee" = {
default = true;
secure_backup_required = false;
secure_backup_setup_methods = [];
};
"m.integrations" = {
managers = [
{
api_url = "https://dimension.pub.solar/api/v1/scalar";
ui_url = "https://dimension.pub.solar/element";
}
];
};
};
wellKnownServer."m.server" = "matrix.pub.solar:8448";
mkWellKnown = data: '' mkWellKnown = data: ''
add_header Content-Type application/json; add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
@ -20,15 +37,19 @@ let
in in
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"test.pub.solar" = {
root = "/dev/null";
forceSSL = lib.mkDefault true; #####################################
enableACME = lib.mkDefault true; # This is already in production use #
#####################################
"pub.solar" = {
locations = wellKnownLocations; locations = wellKnownLocations;
}; };
#######################################
# Stuff below is still in betatesting #
#######################################
"chat.test.pub.solar" = { "chat.test.pub.solar" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;