cotugno/conduit
2
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-16 18:28:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-nix-docs' into 'next'

Browse Source 
fix nix docs

See merge request famedly/conduit!449
This commit is contained in:
Timo Kösters 2023-01-09 15:35:39 +00:00
commit 5e6b498c22
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nix/README.md
View File

@ -107,7 +107,7 @@ in
recommendedProxySettings = true; recommendedProxySettings = true;
virtualHosts = { virtualHosts = {
"${server_name}" = { "${matrix_hostname}" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
@ -124,14 +124,6 @@ in
} }
]; ];
extraConfig = ''
merge_slashes off;
'';
"${matrix_hostname}" = {
forceSSL = true;
enableACME = true;
locations."/_matrix/" = { locations."/_matrix/" = {
proxyPass = "http://backend_conduit$request_uri"; proxyPass = "http://backend_conduit$request_uri";
proxyWebsockets = true; proxyWebsockets = true;
@ -141,6 +133,15 @@ in
''; '';
}; };
extraConfig = ''
merge_slashes off;
'';
};
"${server_name}" = {
forceSSL = true;
enableACME = true;
locations."=/.well-known/matrix/server" = { locations."=/.well-known/matrix/server" = {
# Use the contents of the derivation built previously # Use the contents of the derivation built previously
alias = "${well_known_server}"; alias = "${well_known_server}";