mirror of
https://git.envs.net/envs/matrix-conf.git
synced 2025-07-25 07:55:24 -04:00
update our configs
This commit is contained in:
creme
parent
74cd45ebeb
commit
2abee38762
6 changed files with 39 additions and 52 deletions
|
|
@ -93,13 +93,7 @@ server_name: envs.net
|
|||
#
|
||||
pid_file: "/etc/matrix-synapse/matrix-synapse.pid"
|
||||
|
||||
# The absolute URL to the web client which /_matrix/client will redirect
|
||||
# to if 'webclient' is configured under the 'listeners' configuration.
|
||||
#
|
||||
# This option can be also set to the filesystem path to the web client
|
||||
# which will be served at /_matrix/client/ if 'webclient' is configured
|
||||
# under the 'listeners' configuration, however this is a security risk:
|
||||
# https://github.com/matrix-org/synapse#security-note
|
||||
# The absolute URL to the web client which / will redirect to.
|
||||
#
|
||||
web_client_location: "https://element.envs.net/"
|
||||
|
||||
|
|
@ -329,8 +323,6 @@ allow_public_rooms_over_federation: true
|
|||
# static: static resources under synapse/static (/_matrix/static). (Mostly
|
||||
# useful for 'fallback authentication'.)
|
||||
#
|
||||
# webclient: A web client. Requires web_client_location to be set.
|
||||
#
|
||||
listeners:
|
||||
# TLS-enabled listener: for when matrix traffic is sent directly to synapse.
|
||||
#
|
||||
|
|
@ -362,7 +354,7 @@ listeners:
|
|||
tls: false
|
||||
x_forwarded: true
|
||||
resources:
|
||||
- names: [federation, client, webclient, consent]
|
||||
- names: [federation, client, consent]
|
||||
compress: false
|
||||
|
||||
# example additional_resources:
|
||||
|
|
@ -594,7 +586,7 @@ retention:
|
|||
#
|
||||
#default_policy:
|
||||
# min_lifetime: 30d
|
||||
# max_lifetime: 1y
|
||||
# max_lifetime: 3y
|
||||
|
||||
# Retention policy limits. If set, and the state of a room contains a
|
||||
# 'm.room.retention' event in its state which contains a 'min_lifetime' or a
|
||||
|
|
@ -2709,6 +2701,9 @@ instance_map:
|
|||
generic_worker3:
|
||||
host: localhost
|
||||
port: 9096
|
||||
generic_worker4:
|
||||
host: localhost
|
||||
port: 9097
|
||||
|
||||
# Experimental: When using workers you can define which workers should
|
||||
# handle event persistence and typing notifications. Any worker
|
||||
|
|
@ -2722,6 +2717,7 @@ stream_writers:
|
|||
- generic_worker1
|
||||
- generic_worker2
|
||||
- generic_worker3
|
||||
- generic_worker4
|
||||
# typing: worker1
|
||||
|
||||
# The worker that is used to run background tasks (e.g. cleaning up expired
|
||||
|
|
|
|||
|
|
@ -259,6 +259,18 @@ location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/search$ {
|
|||
}
|
||||
|
||||
|
||||
## Encryption requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/claim {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/room_keys {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
|
||||
## Registration/login requests
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login$ {
|
||||
include include.d/synapse-proxy.conf;
|
||||
|
|
@ -276,74 +288,74 @@ location ~ ^/_matrix/client/unstable/org.matrix.msc3231/register/org.matrix.msc3
|
|||
}
|
||||
|
||||
|
||||
# STREAM WORKERS
|
||||
# STREAM WRITERS
|
||||
## Event sending requests
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/ {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$ {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/join/ {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/ {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://generic_worker_lc_instancemap;
|
||||
proxy_pass http://generic_worker_lc;
|
||||
}
|
||||
|
||||
## Typing requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
## Device requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/sendToDevice/ {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
## Account data requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/tags {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/account_data {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
## Receipts requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/receipt {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/read_markers {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
||||
## Presence requests
|
||||
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/.*/status$ {
|
||||
# include include.d/synapse-proxy.conf;
|
||||
# proxy_pass http://generic_worker_lc_instancemap;
|
||||
# proxy_pass http://generic_worker_lc;
|
||||
#}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,3 @@ upstream generic_worker_lc {
|
|||
server localhost:8512;
|
||||
server localhost:8513;
|
||||
}
|
||||
|
||||
## STREAM WORKER
|
||||
upstream generic_worker_lc_instancemap {
|
||||
least_conn;
|
||||
server localhost:8510;
|
||||
server localhost:8511;
|
||||
server localhost:8512;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,16 +68,3 @@ server {
|
|||
proxy_pass http://localhost:8008;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 8448 ssl http2;
|
||||
listen [::]:8448 ssl http2;
|
||||
server_name matrix.envs.net;
|
||||
|
||||
include snippets/ssl.conf;
|
||||
|
||||
location / {
|
||||
include include.d/synapse-proxy.conf;
|
||||
proxy_pass http://localhost:8008;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue