darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Revert "forward logout to the media server"

Browse source 
This reverts commit 0d5f97e1d9.
This commit is contained in:
Charlotte 🦝 Delenk 2022-08-25 20:20:49 +01:00
parent 0be773bca8
commit cd637d97e6
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
1 changed files with 34 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
config/services/matrix-media-repo.nix
View file

@ -145,19 +145,10 @@ in {
} }
]; ];
services.nginx.virtualHosts = let services.nginx.virtualHosts = let
mediaProxyConfig = {
proxyPass = "http://localhost:8008";
proxyWebsockets = true;
extraConfig = ''
proxy_hide_header Access-Control-Allow-Origin;
add_header Access-Control-Allow-Origin '*' always;
'';
};
main = { main = {
sslCertificate = "/var/lib/acme/chir.rs/cert.pem"; sslCertificate = "/var/lib/acme/chir.rs/cert.pem";
sslCertificateKey = "/var/lib/acme/chir.rs/key.pem"; sslCertificateKey = "/var/lib/acme/chir.rs/key.pem";
locations = { locations."/_matrix" = {
"/_matrix" = {
proxyPass = "https://matrix.int.chir.rs"; proxyPass = "https://matrix.int.chir.rs";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = '' extraConfig = ''
@ -166,8 +157,14 @@ in {
add_header Access-Control-Allow-Origin '*' always; add_header Access-Control-Allow-Origin '*' always;
''; '';
}; };
"/_matrix/media" = mediaProxyConfig; locations."/_matrix/media" = {
"/_matrix/client/v3/logout" = mediaProxyConfig; proxyPass = "http://localhost:8008";
proxyWebsockets = true;
extraConfig = ''
proxy_hide_header Access-Control-Allow-Origin;
add_header Access-Control-Allow-Origin '*' always;
'';
};
locations."/.well-known/matrix/server" = { locations."/.well-known/matrix/server" = {
extraConfig = '' extraConfig = ''
return 200 '{ "m.server": "matrix.chir.rs:443" }'; return 200 '{ "m.server": "matrix.chir.rs:443" }';
@ -185,15 +182,14 @@ in {
''; '';
}; };
}; };
};
in { in {
"matrix.int.chir.rs" = "matrix.int.chir.rs" = main;
"matrix.chir.rs" =
main main
// { // {
sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem"; sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem";
sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem"; sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem";
}; };
"matrix.chir.rs" = main;
"chir.rs" = { "chir.rs" = {
locations."/.well-known/matrix/server" = { locations."/.well-known/matrix/server" = {
extraConfig = '' extraConfig = ''