From ab6e808bc62ab1bec4fc76a710e792d3e06b387b Mon Sep 17 00:00:00 2001 From: Eduardo Beltrame Date: Mon, 29 Jul 2019 17:14:25 -0700 Subject: [PATCH] fix /login for mautrix-hangouts bridge --- .../templates/nginx/conf.d/matrix-synapse.conf.j2 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 index c971c749c..861aa246c 100644 --- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 +++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 @@ -192,12 +192,6 @@ server { rewrite ^/$ /_matrix/static/ last; } - {% if matrix_mautrix_hangouts_enabled %} - location /login { - proxy_pass http://127.0.0.1:8080; - proxy_set_header X-Forwarded-For $remote_addr; - } - {% endif %} } {% if matrix_nginx_proxy_proxy_matrix_federation_api_enabled %} @@ -218,6 +212,13 @@ server { ssl_protocols {{ matrix_nginx_proxy_ssl_protocols }}; ssl_prefer_server_ciphers on; ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; + + {% if matrix_mautrix_hangouts_enabled %} + location /login { + proxy_pass http://matrix-mautrix-hangouts:8080; + proxy_set_header X-Forwarded-For $remote_addr; + } + {% endif %} location / { {% if matrix_nginx_proxy_enabled %}