ungleich-intern/matrix-docker-compose
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring in between

Browse source
This commit is contained in:
Nico Schottelius 2023-12-04 10:16:33 +01:00
commit a138276c54
10 changed files with 80 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ansible/roles/synapse/files/basedir/config/synapse-worker-generic.yaml
View file

@ -9,3 +9,10 @@ worker_listeners:
resources:
- names: [client, federation]
compress: false
- port: 9000
type: metrics
tls: false
x_forwarded: true
resources:
- names: [metrics]
compress: false

16
ansible/roles/synapse/files/basedir/docker-compose.yaml
View file

@ -64,6 +64,7 @@ services:
volumes:
- ./nginx:/etc/nginx/conf.d
- /ssl:/ssl
- /mnt/logs/nginx:/var/log/nginx/
restart: unless-stopped
redis:
@ -71,18 +72,3 @@ services:
ports:
- "6379:6379/tcp"
restart: "unless-stopped"
# synapse-federation-sender-1:
# image: matrixdotorg/synapse:latest
# container_name: synapse-federation-sender-1
# restart: unless-stopped
# entrypoint: ["/start.py", "run", "--config-path=/data/homeserver.yaml", "--config-path=/data/workers/synapse-federation-sender-1.yaml"]
# healthcheck:
# disable: true
# network_mode: "host"
# volumes:
# - ./synapse:/data
# environment:
# SYNAPSE_WORKER: synapse.app.generic_worker
# depends_on:
# - synapse

70
ansible/roles/synapse/files/basedir/nginx/synapse.conf
View file

@ -1,70 +0,0 @@
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
ssl_certificate /ssl/chain.crt;
ssl_certificate_key /ssl/certificate.keyplain;
client_max_body_size 25m;
error_page 403 404 /403_404.html;
location = /403_404.html {
default_type application/json;
return 200 'You are not authorized to access this page.';
}
location / {
root /www;
}
# Sync requests
location ~ ^/_matrix/client/(r0|v3)/sync$|^/_matrix/client/(api/v1|r0|v3)/events$|^/_matrix/client/(api/v1|r0|v3)/initialSync$|^/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$ {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_pass http://synapse-worker-sync:8008;
}
# Federation requests
location ~ ^/_matrix/federation/v1/event/|^/_matrix/federation/v1/state/|^/_matrix/federation/v1/state_ids/|^/_matrix/federation/v1/backfill/|^/_matrix/federation/v1/get_missing_events/|^/_matrix/federation/v1/publicRooms|^/_matrix/federation/v1/query/|^/_matrix/federation/v1/make_join/|^/_matrix/federation/v1/make_leave/|^/_matrix/federation/(v1|v2)/send_join/|^/_matrix/federation/(v1|v2)/send_leave/|^/_matrix/federation/(v1|v2)/invite/|^/_matrix/federation/v1/event_auth/|^/_matrix/federation/v1/timestamp_to_event/|^/_matrix/federation/v1/exchange_third_party_invite/|^/_matrix/federation/v1/user/devices/|^/_matrix/key/v2/query|^/_matrix/federation/v1/hierarchy/|^/_matrix/federation/v1/send/ {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_pass http://synapse-worker-federation:8008;
}
# Client requests
location ~ ^/_matrix/client/(api/v1|r0|unstable)/publicRooms$|^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/joined_members$|^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/context/.*$|^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/members$|^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state$|^/_matrix/client/(api/v1|r0|unstable)/account/3pid$|^/_matrix/client/(api/v1|r0|unstable)/devices$|^/_matrix/client/(api/v1|r0|unstable)/keys/query$|^/_matrix/client/(api/v1|r0|unstable)/keys/changes$|^/_matrix/client/versions$|^/_matrix/client/(api/v1|r0|unstable)/voip/turnServer$|^/_matrix/client/(api/v1|r0|unstable)/joined_groups$|^/_matrix/client/(api/v1|r0|unstable)/publicised_groups$|^/_matrix/client/(api/v1|r0|unstable)/publicised_groups/|^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/event/|^/_matrix/client/(api/v1|r0|unstable)/joined_rooms$|^/_matrix/client/(api/v1|r0|unstable)/search$ {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_pass http://synapse-worker-generic:8008;
}
# Metrics to master
location ~ /_synapse/metrics {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_pass http://synapse-main:9000;
allow 10.161.228.115;
allow 10.161.228.116;
allow 10.161.228.117;
allow 10.161.228.118;
allow 10.161.228.119;
deny all;
}
# All other matrix/synapse requests go to main
location ~ /_matrix|/_synapse {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_pass http://synapse-main:8008;
}
}