Procházet zdrojové kódy

Allow Synapse workers to be used with an external nginx webserver

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.
pull/456/head
Slavi Pantaleev před 5 roky
rodič
revize
eaea215282
1 změnil soubory, kde provedl 20 přidání a 4 odebrání
  1. +20
    -4
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2

+ 20
- 4
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 Zobrazit soubor

@@ -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 %}


Načítá se…
Zrušit
Uložit