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 +3 -8
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6fa03994b1 - Show all commits

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

@ -6,8 +6,8 @@ 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."m.homeserver".base_url = "https://matrix.pub.solar";
wellKnownServer."m.server" = "matrix.test.pub.solar:8448"; wellKnownServer."m.server" = "matrix.pub.solar:8448";
mkWellKnown = data: '' mkWellKnown = data: ''
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
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,12 +20,7 @@ let
in in
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"test.pub.solar" = { "pub.solar" = {
root = "/dev/null";
forceSSL = lib.mkDefault true;
enableACME = lib.mkDefault true;
locations = wellKnownLocations; locations = wellKnownLocations;
}; };