hans/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Cleaned up nginx config a bit, and updated/completed the documentation homepage.

Browse source
This commit is contained in:
Hans van Zijst 2024-12-04 12:27:12 +01:00
parent 5d355c0ff9
commit 16ba9ea609
Signed by: hans
GPG key ID: 43DBCC37BFDEFD72
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
matrix/README.md
View file

@ -35,17 +35,40 @@ This is the core component: the Matrix server itself.
Installation and configuration is documented under [synapse](synapse). 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 # TURN
We may need a TURN server, and we'll use 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, 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 which we'll use if we use [Element Call](call). It's either/or, so make sure
you pick the right approach. 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).

1
matrix/nginx/README.md
View file

@ -255,7 +255,6 @@ server {
proxy_pass http://[::1]:7880; proxy_pass http://[::1]:7880;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
#add_header Access-Control-Allow-Origin "*" always;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-Server $host;

4
matrix/nginx/revproxy.conf
View file

@ -24,7 +24,7 @@ server {
proxy_pass http://[::1]:8082/api/1/report/$room_id/$event_id; 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 { location /_synapse/admin/v1/event_reports {
proxy_pass http://localhost:8008; proxy_pass http://localhost:8008;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -36,7 +36,7 @@ server {
location ~ ^/_synapse/admin/v1/rooms/([^/]*)/context/(.*)$ { location ~ ^/_synapse/admin/v1/rooms/([^/]*)/context/(.*)$ {
set $room_id $2; set $room_id $2;
set $event_id $3; 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-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $host; proxy_set_header Host $host;