|
|
|
@@ -101,115 +101,60 @@ |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% if matrix_synapse_workers_enabled %} |
|
|
|
{% if synchrotron_workers %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L134 #} |
|
|
|
location /_matrix/client/r0/sync { |
|
|
|
proxy_pass http://synchrotron$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
location /_matrix/client/r0/events { |
|
|
|
proxy_pass http://synchrotron$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
location /_matrix/client/r0/initialSync { |
|
|
|
proxy_pass http://synchrotron$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
location ~ ^/_matrix/client/r0/rooms/[^/]+/initialSync$ { |
|
|
|
proxy_pass http://synchrotron$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% set client_reader_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'client_reader')|first %} |
|
|
|
{% if client_reader_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L252 #} |
|
|
|
location ^/_matrix/client/(versions$|(api/v1|r0|unstable)/(publicRooms$|rooms/.*/joined_me|rooms/.*/context/.|rooms/.*/members$|rooms/.*/messages$|rooms/.*/state$|login$|account/3pid$|keys/query$|keys/changes$|voip/turnServer$|joined_groups$|publicised_groups$|publicised_groups/|pushrules/.*$|groups/.*$|register$|auth/.*/fallback/web$)) { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ client_reader_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if matrix_nginx_proxy_synapse_workers_enabled %} |
|
|
|
{# Synapse Workers #} |
|
|
|
|
|
|
|
{% if generic_worker_workers %} |
|
|
|
{# https://github.com/matrix-org/synapse/blob/master/docs/workers.md#synapseappgeneric_worker #} |
|
|
|
{% for location in matrix_nginx_proxy_synapse_generic_worker_locations %} |
|
|
|
location ~ {{ location }} { |
|
|
|
proxy_pass http://generic_worker_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endfor %} |
|
|
|
{# ToDo: add GET ^/_matrix/federation/v1/groups/ #} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% set media_repository_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'media_repository')|first %} |
|
|
|
{% if media_repository_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L219 #} |
|
|
|
location /_matrix/media/ { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ media_repository_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L223 #} |
|
|
|
location ~ ^/_synapse/admin/v1/(purge_media_cache|room/.*/media.*|user/.*/media.*|media/.*|quarantine_media/.*)$ { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ media_repository_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if media_repository_workers %} |
|
|
|
{# https://github.com/matrix-org/synapse/blob/master/docs/workers.md#synapseappmedia_repository #} |
|
|
|
{% for location in matrix_nginx_proxy_synapse_media_repository_locations %} |
|
|
|
location ~ {{ location }} { |
|
|
|
proxy_pass http://media_repository_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endfor %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% set event_creator_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'event_creator')|first %} |
|
|
|
{% if event_creator_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L323 #} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/(rooms/.*/send|rooms/.*/state/|rooms/.*/(join|invite|leave|ban|unban|kick)$|join/|profile/) { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ event_creator_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if user_dir_workers %} |
|
|
|
{# https://github.com/matrix-org/synapse/blob/master/docs/workers.md#synapseappuser_dir #} |
|
|
|
{% for location in matrix_nginx_proxy_synapse_user_dir_locations %} |
|
|
|
location ~ {{ location }} { |
|
|
|
proxy_pass http://user_dir_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endfor %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% set frontend_proxy_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'frontend_proxy')|first %} |
|
|
|
{% if frontend_proxy_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L302 #} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/keys/upload { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ frontend_proxy_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% if not matrix_synapse_use_presence %} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/presence/[^/]+/status { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ frontend_proxy_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if frontend_proxy_workers %} |
|
|
|
{# https://github.com/matrix-org/synapse/blob/master/docs/workers.md#synapseappfrontend_proxy #} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/keys/upload { |
|
|
|
proxy_pass http://frontend_proxy_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% if not matrix_synapse_use_presence %} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/presence/[^/]+/status { |
|
|
|
proxy_pass http://frontend_proxy_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% set user_dir_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'user_dir')|first %} |
|
|
|
{% if user_dir_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L290 #} |
|
|
|
location ~ ^/_matrix/client/(api/v1|r0|unstable)/user_directory/search$ { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ user_dir_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% for configuration_block in matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks %} |
|
|
|
{{- configuration_block }} |
|
|
|
@@ -284,19 +229,51 @@ |
|
|
|
} |
|
|
|
{% endmacro %} |
|
|
|
|
|
|
|
{% if matrix_synapse_workers_enabled %} |
|
|
|
{% set synchrotron_workers = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'synchrotron')|list %} |
|
|
|
{% if synchrotron_workers %} |
|
|
|
upstream synchrotron { |
|
|
|
# ensures that requests from the same client will always be passed |
|
|
|
# to the same server (except when this server is unavailable) |
|
|
|
ip_hash; |
|
|
|
{% set generic_worker_workers = matrix_nginx_proxy_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'generic_worker')|list %} |
|
|
|
{% set media_repository_workers = matrix_nginx_proxy_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'media_repository')|list %} |
|
|
|
{% set user_dir_workers = matrix_nginx_proxy_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'user_dir')|list %} |
|
|
|
{% set frontend_proxy_workers = matrix_nginx_proxy_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'frontend_proxy')|list %} |
|
|
|
{% if matrix_nginx_proxy_synapse_workers_enabled %} |
|
|
|
{# Setup upstream for groups of workers #} |
|
|
|
|
|
|
|
{% if generic_worker_workers %} |
|
|
|
upstream generic_worker_upstream { |
|
|
|
# ensures that requests from the same client will always be passed |
|
|
|
# to the same server (except when this server is unavailable) |
|
|
|
ip_hash; |
|
|
|
|
|
|
|
{% for worker in generic_worker_workers %} |
|
|
|
server "matrix-synapse:{{ worker.port }}"; |
|
|
|
{% endfor %} |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% for synchrotron_worker in synchrotron_workers %} |
|
|
|
server "matrix-synapse:{{ synchrotron_worker.port }}"; |
|
|
|
{% endfor %} |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if frontend_proxy_workers %} |
|
|
|
upstream frontend_proxy_upstream { |
|
|
|
# Round Robin |
|
|
|
{% for worker in frontend_proxy_workers %} |
|
|
|
server "matrix-synapse:{{ worker.port }}"; |
|
|
|
{% endfor %} |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% if media_repository_workers %} |
|
|
|
upstream media_repository_upstream { |
|
|
|
# Round Robin |
|
|
|
{% for worker in media_repository_workers %} |
|
|
|
server "matrix-synapse:{{ worker.port }}"; |
|
|
|
{% endfor %} |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% if user_dir_workers %} |
|
|
|
upstream user_dir_upstream { |
|
|
|
# Round Robin |
|
|
|
{% for worker in user_dir_workers %} |
|
|
|
server "matrix-synapse:{{ worker.port }}"; |
|
|
|
{% endfor %} |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
server { |
|
|
|
@@ -380,19 +357,18 @@ server { |
|
|
|
ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% if matrix_synapse_workers_enabled } |
|
|
|
{% set federation_reader_worker = matrix_synapse_workers_enabled_list|selectattr('worker', 'equalto', 'federation_reader')|first %} |
|
|
|
{% if federation_reader_worker %} |
|
|
|
{# c.f. https://github.com/matrix-org/synapse/blame/master/docs/workers.md#L160 #} |
|
|
|
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/send_join/|/_matrix/federation/v2/send_join/|/_matrix/federation/v1/send_leave/|/_matrix/federation/v2/send_leave/|/_matrix/federation/v1/invite/|/_matrix/federation/v2/invite/|/_matrix/federation/v1/query_auth/|/_matrix/federation/v1/event_auth/|/_matrix/federation/v1/exchange_third_party_invite/|/_matrix/federation/v1/user/devices/|/_matrix/federation/v1/send/|/_matrix/federation/v1/get_groups_publicised$|/_matrix/key/v2/query|/_matrix/federation/v1/groups/) { |
|
|
|
{# Use the embedded DNS resolver in Docker containers to discover the service #} |
|
|
|
resolver 127.0.0.11 valid=5s; |
|
|
|
set $backend "matrix-synapse:{{ federation_reader_worker.port }}"; |
|
|
|
proxy_pass http://$backend$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endif %} |
|
|
|
{% if matrix_nginx_proxy_synapse_workers_enabled %} |
|
|
|
{% if generic_worker_workers %} |
|
|
|
{# https://github.com/matrix-org/synapse/blob/master/docs/workers.md#synapseappgeneric_worker #} |
|
|
|
{% for location in matrix_nginx_proxy_synapse_generic_worker_locations %} |
|
|
|
location ~ {{ location }} { |
|
|
|
proxy_pass http://generic_worker_upstream$request_uri; |
|
|
|
proxy_set_header Host $host; |
|
|
|
proxy_set_header X-Forwarded-For $remote_addr; |
|
|
|
} |
|
|
|
{% endfor %} |
|
|
|
{# ToDo: add GET ^/_matrix/federation/v1/groups/ #} |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
location / { |
|
|
|
|
Max Klenk
5 лет назад