Procházet zdrojové kódy

add mapping for jvb to hostname/ip

pull/2166/head
Warren Bailey před 3 roky
rodič
revize
93734eb725
2 změnil soubory, kde provedl 15 přidání a 4 odebrání
  1. +6
    -0
      roles/matrix-nginx-proxy/defaults/main.yml
  2. +9
    -4
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2

+ 6
- 0
roles/matrix-nginx-proxy/defaults/main.yml Zobrazit soubor

@@ -646,3 +646,9 @@ matrix_nginx_proxy_synapse_cache_proxy_cache_valid_time: "24h"
# http://nginx.org/en/docs/ngx_core_module.html#worker_connections
matrix_nginx_proxy_worker_processes: auto
matrix_nginx_proxy_worker_connections: 1024

# A mapping of JVB ids to hostname for additional jvb blocks to add to Jitsi's server configuration (matrix-jitsi.conf)
matrix_nginx_proxy_proxy_jitsi_additional_jvbs_enabled: false
matrix_nginx_proxy_proxy_jitsi_additional_jvbs:
- jvb-2: 192.168.0.1
- jvb-3: 192.168.0.2

+ 9
- 4
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2 Zobrazit soubor

@@ -53,13 +53,15 @@

tcp_nodelay on;
}

{% if matrix_nginx_proxy_proxy_jitsi_additional_jvbs_enabled %}
{% for jvb in matrix_nginx_proxy_proxy_jitsi_additional_jvbs %}
{% for id in jvb %}
# colibri (JVB) websockets for additional JVBs
location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) {
proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args;
location ~ ^/colibri-ws/{{ id }}/(.*) {
proxy_pass http://{{ jvb[id] }}:9090/colibri-ws/{{ id }}/$2$is_args$args;

proxy_set_header Host $host;
proxy_set_header X-Forwarded-For {{ matrix_nginx_proxy_x_forwarded_for }};
proxy_set_header X-Forwarded-For {{ matrix_nginx_proxy_x_forwarded_for }};
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

@@ -67,6 +69,9 @@

tcp_nodelay on;
}
{% endfor %}
{% endfor %}
{% endif %}

# XMPP websocket
location = /xmpp-websocket {


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