finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix point overlap between matrix-domain and Jitsi

Browse Source 
Mostly affects people who disable the integrated `matrix-nginx-proxy`.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/456
and more specifically 4d62a75f6f.
This commit is contained in:
Slavi Pantaleev
2021-03-01 20:27:45 +02:00
parent c527f2930e
commit a25b8135b8
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/caddy2/Caddyfile
View File

@@ -101,7 +101,7 @@ element.DOMAIN.tld {
# creates letsencrypt certificate # creates letsencrypt certificate
# tls your@email.com # tls your@email.com
header { header {
# Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS # Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS
Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
@@ -128,10 +128,10 @@ element.DOMAIN.tld {
} }
#dimension.DOMAIN.tld { #dimension.DOMAIN.tld {
# #
# # creates letsencrypt certificate # # creates letsencrypt certificate
# # tls your@email.com # # tls your@email.com
# #
# header { # header {
# # Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS # # Enable HTTP Strict Transport Security (HSTS) to force clients to always connect via HTTPS
# Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" # Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
@@ -160,7 +160,7 @@ element.DOMAIN.tld {
#jitsi.DOMAIN.tld { #jitsi.DOMAIN.tld {
# #
# creates letsencrypt certificate # creates letsencrypt certificate
# tls your@email.com # tls your@email.com
# #
@@ -193,7 +193,7 @@ element.DOMAIN.tld {
# handle { # handle {
# encode zstd gzip # encode zstd gzip
# #
# reverse_proxy 127.0.0.1:12080 { # reverse_proxy 127.0.0.1:13080 {
# header_up X-Forwarded-Port {http.request.port} # header_up X-Forwarded-Port {http.request.port}
# header_up X-Forwarded-Proto {http.request.scheme} # header_up X-Forwarded-Proto {http.request.scheme}
# header_up X-Forwarded-TlsProto {tls_protocol} # header_up X-Forwarded-TlsProto {tls_protocol}
@@ -201,4 +201,4 @@ element.DOMAIN.tld {
# header_up X-Forwarded-HttpsProto {proto} # header_up X-Forwarded-HttpsProto {proto}
# } # }
# } # }
#} #}

4
group_vars/matrix_servers
View File

@@ -905,9 +905,9 @@ matrix_jitsi_enabled: false
# Normally, matrix-nginx-proxy is enabled and nginx can reach jitsi/web over the container network. # Normally, matrix-nginx-proxy is enabled and nginx can reach jitsi/web over the container network.
# If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
# the Jitsi HTTP port to the local host. # the Jitsi HTTP port to the local host.
matrix_jitsi_web_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:12080' }}" matrix_jitsi_web_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:13080' }}"
matrix_jitsi_jvb_container_colibri_ws_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:12090' }}" matrix_jitsi_jvb_container_colibri_ws_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:13090' }}"
matrix_jitsi_jibri_xmpp_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'jibri') | to_uuid }}" matrix_jitsi_jibri_xmpp_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'jibri') | to_uuid }}"
matrix_jitsi_jicofo_auth_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'jicofo') | to_uuid }}" matrix_jitsi_jicofo_auth_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'jicofo') | to_uuid }}"

2
roles/matrix-jitsi/defaults/main.yml
View File

@@ -73,7 +73,7 @@ matrix_jitsi_etherpad_enabled: false
# Controls whether the matrix-jitsi-web container exposes its HTTP port (tcp/80 in the container). # Controls whether the matrix-jitsi-web container exposes its HTTP port (tcp/80 in the container).
# #
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:12080"), or empty string to not expose. # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:13080"), or empty string to not expose.
matrix_jitsi_web_container_http_host_bind_port: '' matrix_jitsi_web_container_http_host_bind_port: ''
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container

4
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2
View File

@@ -17,7 +17,7 @@
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:12080; proxy_pass http://127.0.0.1:13080;
{% endif %} {% endif %}
proxy_set_header Host $host; proxy_set_header Host $host;
@@ -32,7 +32,7 @@
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:12090; proxy_pass http://127.0.0.1:13090;
{% endif %} {% endif %}
proxy_set_header Host $host; proxy_set_header Host $host;