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