move turn over to its own role
This commit is contained in:
Nico Schottelius
parent
4dffeb3bf6
commit
67f3f2dbd1
15 changed files with 23 additions and 79 deletions
|
|
@ -1,5 +0,0 @@
|
|||
SYNAPSE_VERSION=v1.96.1
|
||||
NGINX_VERSION=1.25.3-alpine
|
||||
|
||||
SYNAPSE_SERVER_NAME=corp-serv.net
|
||||
NGINX_SYNAPSE_FQDN=synapse.corp-apps.com
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,33 +0,0 @@
|
|||
version: 1
|
||||
|
||||
formatters:
|
||||
fmt:
|
||||
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
|
||||
|
||||
filters:
|
||||
context:
|
||||
(): synapse.logging.context.LoggingContextFilter
|
||||
request: ""
|
||||
|
||||
handlers:
|
||||
console:
|
||||
class: logging.StreamHandler
|
||||
formatter: fmt
|
||||
filters: [context]
|
||||
|
||||
root:
|
||||
level: INFO
|
||||
handlers: [console] # to use file handler instead, switch to [file]
|
||||
|
||||
loggers:
|
||||
synapse:
|
||||
level: INFO
|
||||
|
||||
synapse.storage.SQL:
|
||||
level: INFO
|
||||
|
||||
ldap3:
|
||||
level: INFO
|
||||
|
||||
ldap_auth_provider:
|
||||
level: INFO
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
worker_app: synapse.app.generic_worker
|
||||
worker_name: synapse-worker-federation
|
||||
|
||||
worker_listeners:
|
||||
- type: http
|
||||
port: 8008
|
||||
x_forwarded: true
|
||||
resources:
|
||||
- names:
|
||||
- client
|
||||
- federation
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
worker_app: synapse.app.generic_worker
|
||||
worker_name: synapse-worker-generic
|
||||
|
||||
worker_listeners:
|
||||
- port: 8008
|
||||
type: http
|
||||
tls: false
|
||||
x_forwarded: true
|
||||
resources:
|
||||
- names: [client, federation]
|
||||
compress: false
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
worker_app: synapse.app.generic_worker
|
||||
worker_name: synapse-worker-sync
|
||||
|
||||
worker_listeners:
|
||||
- type: http
|
||||
port: 8008
|
||||
x_forwarded: true
|
||||
resources:
|
||||
- names:
|
||||
- client
|
||||
- federation
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
version: '3'
|
||||
services:
|
||||
synapse-main:
|
||||
image: matrixdotorg/synapse:${SYNAPSE_VERSION}
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
command:
|
||||
- run
|
||||
- --config-path=/config/homeserver.yaml
|
||||
restart: always
|
||||
|
||||
synapse-worker-generic:
|
||||
image: matrixdotorg/synapse:${SYNAPSE_VERSION}
|
||||
command:
|
||||
- run
|
||||
- "--config-path=/config/homeserver.yaml"
|
||||
- "--config-path=/config/synapse-worker-generic.yaml"
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
environment:
|
||||
SYNAPSE_WORKER: synapse.app.generic_worker
|
||||
depends_on:
|
||||
- synapse-main
|
||||
restart: unless-stopped
|
||||
|
||||
synapse-worker-sync:
|
||||
image: matrixdotorg/synapse:${SYNAPSE_VERSION}
|
||||
command:
|
||||
- run
|
||||
- "--config-path=/config/homeserver.yaml"
|
||||
- "--config-path=/config/synapse-worker-sync.yaml"
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
environment:
|
||||
SYNAPSE_WORKER: synapse.app.generic_worker
|
||||
depends_on:
|
||||
- synapse-main
|
||||
restart: unless-stopped
|
||||
|
||||
synapse-worker-federation:
|
||||
image: matrixdotorg/synapse:${SYNAPSE_VERSION}
|
||||
command:
|
||||
- run
|
||||
- "--config-path=/config/homeserver.yaml"
|
||||
- "--config-path=/config/synapse-worker-federation.yaml"
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
environment:
|
||||
SYNAPSE_WORKER: synapse.app.generic_worker
|
||||
depends_on:
|
||||
- synapse-main
|
||||
restart: unless-stopped
|
||||
|
||||
|
||||
nginx:
|
||||
image: nginx:${NGINX_VERSION}
|
||||
ports:
|
||||
- "80:80/tcp"
|
||||
- "443:443/tcp"
|
||||
volumes:
|
||||
- ./nginx:/etc/nginx/conf.d
|
||||
- /ssl:/ssl
|
||||
restart: unless-stopped
|
||||
|
||||
redis:
|
||||
image: "redis:latest"
|
||||
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
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
version: '3'
|
||||
services:
|
||||
synapse-main:
|
||||
image: matrixdotorg/synapse:${SYNAPSE_VERSION}
|
||||
ports:
|
||||
- "8008:8008/tcp"
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
# ports:
|
||||
# - "8008:8008/tcp"
|
||||
command:
|
||||
- run
|
||||
- --config-path=/config/homeserver.yaml
|
||||
restart: always
|
||||
|
||||
synapse-worker-generic:
|
||||
image: matrixdotorg/synapse:latest
|
||||
command:
|
||||
- run
|
||||
- "--config-path=/config/homeserver.yaml"
|
||||
- "--config-path=/config/synapse-worker-generic.yaml"
|
||||
# ports:
|
||||
# - "8008:8008/tcp"
|
||||
volumes:
|
||||
- /mnt/synapse_data:/data
|
||||
- ./config:/config
|
||||
environment:
|
||||
SYNAPSE_WORKER: synapse.app.generic_worker
|
||||
depends_on:
|
||||
- synapse-main
|
||||
restart: unless-stopped
|
||||
# healthcheck:
|
||||
# test: ["CMD-SHELL", "curl -fSs http://localhost:8081/health || exit 1"]
|
||||
# start_period: "5s"
|
||||
# interval: "15s"
|
||||
# timeout: "5s"
|
||||
|
||||
|
||||
nginx:
|
||||
image: nginx:${NGINX_VERSION}
|
||||
ports:
|
||||
- "80:80/tcp"
|
||||
- "443:443/tcp"
|
||||
volumes:
|
||||
- ./nginx:/etc/nginx/conf.d
|
||||
- /ssl:/ssl
|
||||
restart: unless-stopped
|
||||
|
||||
redis:
|
||||
image: "redis:latest"
|
||||
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
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
Test for Synapse
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
version: '3.8'
|
||||
services:
|
||||
coturn:
|
||||
image: coturn/coturn:latest
|
||||
restart: unless-stopped
|
||||
network_mode: "host"
|
||||
volumes:
|
||||
- ./turnserver.conf:/etc/turnserver.conf
|
||||
- ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
|
||||
- ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
|
||||
- ./nginx:/etc/nginx/conf.d
|
||||
- /ssl:/ssl
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
realm=turn-1.corp-serv.net
|
||||
no-tcp-relay
|
||||
listening-ip=0.0.0.0
|
||||
listening-port=3478
|
||||
min-port=49152
|
||||
max-port=65535
|
||||
|
||||
external-ip=135.125.151.180/10.80.24.41
|
||||
|
||||
log-file=stdout
|
||||
verbose
|
||||
pidfile=/var/tmp/turnserver.pid
|
||||
use-auth-secret
|
||||
static-auth-secret=ihaaCac6Oow3ohzuvequ6esoo9eegheex
|
||||
|
||||
tls-listening-port=5349
|
||||
pkey=/ssl/certificate.keyplain
|
||||
cert=/ssl/chain.crt
|
||||
Loading…
Add table
Add a link
Reference in a new issue