From 391beddaf4034e114020c707198414fd6e4d141a Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 8 Jan 2023 12:44:59 -0800
Subject: [PATCH] fix nix docs
I made some silly copy paste errors while writing this...
---
nix/README.md | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/nix/README.md b/nix/README.md
index d92f910b..77bad0fa 100644
--- a/nix/README.md
+++ b/nix/README.md
@@ -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}";