From 16ba9ea609f8860e5a14aa3fcea1880b81eec6cc Mon Sep 17 00:00:00 2001
From: Hans van Zijst <hans@procolix.com>
Date: Wed, 4 Dec 2024 12:27:12 +0100
Subject: [PATCH] Cleaned up nginx config a bit, and updated/completed the
 documentation homepage.

---
 matrix/README.md           | 29 ++++++++++++++++++++++++++---
 matrix/nginx/README.md     |  1 -
 matrix/nginx/revproxy.conf |  4 ++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/matrix/README.md b/matrix/README.md
index 1d564cb..02ac508 100644
--- a/matrix/README.md
+++ b/matrix/README.md
@@ -35,17 +35,40 @@ This is the core component: the Matrix server itself.
 Installation and configuration is documented under [synapse](synapse).
 
 
+# nginx
+
+We need a webserver for several things, see how to [configure nginx](nginx)
+here.
+
+
+# Element Call
+
+Element Call is the new way to have audio and video conferences, both
+one-on-one and with groups. This does not use Jitsi and keeps E2EE intact. See
+how to [setup and configure it](element-call).
+
+
+# Element Web
+
+This is the fully-fledged web client, which is very [easy to set
+up](element-call).
+
+
 # TURN
 
 We may need a TURN server, and we'll use
-[coturn](https://github.com/coturn/coturn) for that.
+[coturn](coturn) for that.
 
 It's apparently also possible to use the built-in TURN server in Livekit,
 which we'll use if we use [Element Call](call). It's either/or, so make sure
 you pick the right approach.
 
+You could possibly use both coturn and LiveKit, if you insist on being able to
+use both legacy and Element Call functionality. This is not documented here
+yet.
 
-# Wiki
 
-Of course there's a wiki in this repository.
+# Draupnir
 
+With Draupnir you can do moderation. It requires a few changes to both Synapse
+and nginx, here's how to [install and configure Draupnir](draupnir).
diff --git a/matrix/nginx/README.md b/matrix/nginx/README.md
index 399a6bd..63afd7f 100644
--- a/matrix/nginx/README.md
+++ b/matrix/nginx/README.md
@@ -255,7 +255,6 @@ server {
         proxy_pass http://[::1]:7880;
         proxy_set_header Connection "upgrade";
         proxy_set_header Upgrade $http_upgrade;
-        #add_header Access-Control-Allow-Origin "*" always;
         
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Server $host;
diff --git a/matrix/nginx/revproxy.conf b/matrix/nginx/revproxy.conf
index 14a8e2c..d29cce0 100644
--- a/matrix/nginx/revproxy.conf
+++ b/matrix/nginx/revproxy.conf
@@ -24,7 +24,7 @@ server {
 		proxy_pass http://[::1]:8082/api/1/report/$room_id/$event_id;
 	}
 
-	# Reports that need to reach Synapse (not really sure it this is used)
+	# Reports that need to reach Synapse (not really sure if this is used)
 	location /_synapse/admin/v1/event_reports {
 		proxy_pass http://localhost:8008;
 		proxy_set_header X-Forwarded-For $remote_addr;
@@ -36,7 +36,7 @@ server {
 	location ~ ^/_synapse/admin/v1/rooms/([^/]*)/context/(.*)$ {
 		set $room_id $2;
 		set $event_id $3;
-		proxy_pass http://localhost:8008/_synapse/admin/v1/rooms/$room_id/context/$evend_id;
+		proxy_pass http://localhost:8008/_synapse/admin/v1/rooms/$room_id/context/$event_id;
 		proxy_set_header X-Forwarded-For $remote_addr;
 		proxy_set_header X-Forwarded-Proto $scheme;
 		proxy_set_header Host $host;