update some config files from server

This commit is contained in:
creme 2022-01-08 14:44:18 +01:00
parent 89f7aa6229
commit ecb3af34c9
No known key found for this signature in database
GPG key ID: C147C3B7FBDF08D0
15 changed files with 637 additions and 235 deletions

View file

@ -7,270 +7,270 @@
#
## Sync requests
location ~* ^/_matrix/client/(v2_alpha|r0|v3)/sync$ {
location ~ ^/_matrix/client/(v2_alpha|r0|v3)/sync$ {
include include.d/synapse-proxy.conf;
proxy_pass http://localhost:8083;
}
location ~* ^/_matrix/client/(api/v1|v2_alpha|r0|v3)/events$ {
location ~ ^/_matrix/client/(api/v1|v2_alpha|r0|v3)/events$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3)/initialSync$ {
location ~ ^/_matrix/client/(api/v1|r0|v3)/initialSync$ {
include include.d/synapse-proxy.conf;
proxy_pass http://localhost:8083;
}
location ~* ^/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$ {
location ~ ^/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$ {
include include.d/synapse-proxy.conf;
proxy_pass http://localhost:8083;
}
## Federation requests
location ~* ^/_matrix/federation/v1/event/ {
location ~ ^/_matrix/federation/v1/event/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/state/ {
location ~ ^/_matrix/federation/v1/state/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/state_ids/ {
location ~ ^/_matrix/federation/v1/state_ids/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/backfill/ {
location ~ ^/_matrix/federation/v1/backfill/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/get_missing_events/ {
location ~ ^/_matrix/federation/v1/get_missing_events/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/publicRooms {
location ~ ^/_matrix/federation/v1/publicRooms {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/query/ {
location ~ ^/_matrix/federation/v1/query/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/make_join/ {
location ~ ^/_matrix/federation/v1/make_join/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/make_leave/ {
location ~ ^/_matrix/federation/v1/make_leave/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/send_join/ {
location ~ ^/_matrix/federation/v1/send_join/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v2/send_join/ {
location ~ ^/_matrix/federation/v2/send_join/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/send_leave/ {
location ~ ^/_matrix/federation/v1/send_leave/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v2/send_leave/ {
location ~ ^/_matrix/federation/v2/send_leave/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/invite/ {
location ~ ^/_matrix/federation/v1/invite/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v2/invite/ {
location ~ ^/_matrix/federation/v2/invite/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/query_auth/ {
location ~ ^/_matrix/federation/v1/query_auth/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/event_auth/ {
location ~ ^/_matrix/federation/v1/event_auth/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/exchange_third_party_invite/ {
location ~ ^/_matrix/federation/v1/exchange_third_party_invite/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/user/devices/ {
location ~ ^/_matrix/federation/v1/user/devices/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/v1/get_groups_publicised$ {
location ~ ^/_matrix/federation/v1/get_groups_publicised$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/key/v2/query {
location ~ ^/_matrix/key/v2/query {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/unstable/org.matrix.msc2946/spaces/ {
location ~ ^/_matrix/federation/unstable/org.matrix.msc2946/spaces/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/federation/(v1|unstable/org.matrix.msc2946)/hierarchy/ {
location ~ ^/_matrix/federation/(v1|unstable/org.matrix.msc2946)/hierarchy/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
## Inbound federation transaction request
location ~* ^/_matrix/federation/v1/send/ {
location ~ ^/_matrix/federation/v1/send/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_ih;
}
## Client API requests
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/publicRooms$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/publicRooms$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/joined_members$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/joined_members$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/context/.*$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/context/.*$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/unstable/org.matrix.msc2946/rooms/.*/spaces$ {
location ~ ^/_matrix/client/unstable/org.matrix.msc2946/rooms/.*/spaces$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(v1|unstable/org.matrix.msc2946)/rooms/.*/hierarchy$ {
location ~ ^/_matrix/client/(v1|unstable/org.matrix.msc2946)/rooms/.*/hierarchy$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$ {
location ~ ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/account/3pid$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/account/3pid$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/devices$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/devices$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/query$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/query$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/changes$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/changes$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/versions$ {
location ~ ^/_matrix/client/versions$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/joined_groups$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/joined_groups$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/publicised_groups$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/publicised_groups$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/publicised_groups/ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/publicised_groups/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/joined_rooms$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/joined_rooms$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/search$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/search$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
## Registration/login requests
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/login$ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/(r0|v3|unstable)/register$ {
location ~ ^/_matrix/client/(r0|v3|unstable)/register$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
location ~* ^/_matrix/client/unstable/org.matrix.msc3231/register/org.matrix.msc3231.login.registration_token/validity$ {
location ~ ^/_matrix/client/unstable/org.matrix.msc3231/register/org.matrix.msc3231.login.registration_token/validity$ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc;
}
@ -278,72 +278,72 @@ location ~* ^/_matrix/client/unstable/org.matrix.msc3231/register/org.matrix.msc
# STREAM WORKERS
## Event sending requests
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc_instancemap;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc_instancemap;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc_instancemap;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$ {
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;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/join/ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/join/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc_instancemap;
}
location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/ {
location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/ {
include include.d/synapse-proxy.conf;
proxy_pass http://generic_worker_lc_instancemap;
}
## Typing requests
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
## Device requests
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/sendToDevice/ {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/sendToDevice/ {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
## Account data requests
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/tags {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/tags {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/account_data {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/.*/account_data {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
## Receipts requests
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/receipt {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/receipt {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/read_markers {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/read_markers {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}
## Presence requests
#location ~* ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/.*/status$ {
#location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/.*/status$ {
# include include.d/synapse-proxy.conf;
# proxy_pass http://generic_worker_lc_instancemap;
#}

View file

@ -13,17 +13,6 @@ server {
}
map $http_origin $DO_CORS {
# indicates all map values are hostnames and should be parsed as such
hostnames;
# default value
default 'true';
# blocked domains
renaissance.eu.org 'false';
element.renaissance.eu.org 'false';
}
# WORKERS
upstream generic_worker_ih {
ip_hash;
@ -57,17 +46,21 @@ server {
## well-known
location /.well-known/matrix/support {
# add_header Access-Control-Allow-Origin "$DO_CORS";
add_header Access-Control-Allow-Origin '*' always;
add_header Content-Type application/json;
return 200 '{"admins": [{"matrix_id": "@creme:envs.net", "email_address": "hostmaster@envs.net", "role": "admin"}], "support_page": "https://matrix.to/#/#envs:envs.net"}';
}
location /.well-known/matrix {
# add_header Access-Control-Allow-Origin "$DO_CORS";
location /.well-known/matrix/server {
add_header Access-Control-Allow-Origin '*' always;
add_header Content-Type application/json;
return 200 '{"m.server": "matrix.envs.net:443", "m.homeserver": {"base_url": "https://matrix.envs.net"}, "m.integrations": {"managers": [{"ui_url": "https://dimension.envs.net/riot", "api_url": "https://dimension.envs.net/api/v1/scalar"}, {"ui_url": "https://scalar.vector.im/", "api_url": "https://scalar.vector.im/api"}]}, "m.integrations_widget": {"url": "https://dimension.envs.net/riot", "data": {"api_url": "https://dimension.envs.net/api/v1/scalar"}}}';
return 200 '{"m.server": "matrix.envs.net:443"}';
}
location /.well-known/matrix/client {
add_header Access-Control-Allow-Origin '*' always;
add_header Content-Type application/json;
return 200 '{"m.homeserver": {"base_url": "https://matrix.envs.net"}, "m.integrations": {"managers": [{"ui_url": "https://dimension.envs.net/riot", "api_url": "https://dimension.envs.net/api/v1/scalar"}, {"ui_url": "https://scalar.vector.im/", "api_url": "https://scalar.vector.im/api"}]}, "m.integrations_widget": {"url": "https://dimension.envs.net/riot", "data": {"api_url": "https://dimension.envs.net/api/v1/scalar"}}}';
}
# workers
@ -96,3 +89,16 @@ 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;
}
}