pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow Synapse workers to be used with an external nginx webserver

Browse source 
We're talking about a webserver running on the same machine, which
imports the configuration files generated by the `matrix-nginx-proxy`
in the `/matrix/nginx-proxy/conf.d` directory.

Users who run an nginx webserver on some other machine will need to do
something different.
This commit is contained in:
Slavi Pantaleev 2021-02-19 11:36:48 +02:00
parent 2f732e4234
commit eaea215282
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
View file

@ -14,7 +14,11 @@
ip_hash; ip_hash;
{% for worker in generic_workers %} {% for worker in generic_workers %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}"; {% if matrix_nginx_proxy_enabled %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}";
{% else %}
server "127.0.0.1:{{ worker.port }}";
{% endif %}
{% endfor %} {% endfor %}
} }
{% endif %} {% endif %}
@ -22,7 +26,11 @@
{% if frontend_proxy_workers %} {% if frontend_proxy_workers %}
upstream frontend_proxy_upstream { upstream frontend_proxy_upstream {
{% for worker in frontend_proxy_workers %} {% for worker in frontend_proxy_workers %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}"; {% if matrix_nginx_proxy_enabled %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}";
{% else %}
server "127.0.0.1:{{ worker.port }}";
{% endif %}
{% endfor %} {% endfor %}
} }
{% endif %} {% endif %}
@ -30,7 +38,11 @@
{% if media_repository_workers %} {% if media_repository_workers %}
upstream media_repository_upstream { upstream media_repository_upstream {
{% for worker in media_repository_workers %} {% for worker in media_repository_workers %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}"; {% if matrix_nginx_proxy_enabled %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}";
{% else %}
server "127.0.0.1:{{ worker.port }}";
{% endif %}
{% endfor %} {% endfor %}
} }
{% endif %} {% endif %}
@ -38,7 +50,11 @@
{% if user_dir_workers %} {% if user_dir_workers %}
upstream user_dir_upstream { upstream user_dir_upstream {
{% for worker in user_dir_workers %} {% for worker in user_dir_workers %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}"; {% if matrix_nginx_proxy_enabled %}
server "matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.port }}";
{% else %}
server "127.0.0.1:{{ worker.port }}";
{% endif %}
{% endfor %} {% endfor %}
} }
{% endif %} {% endif %}