From c71cef3f70d89b043ce94a1287b3e8d5c2d73014 Mon Sep 17 00:00:00 2001 From: Eduardo Beltrame Date: Mon, 29 Jul 2019 19:58:19 -0700 Subject: [PATCH] Add hangouts /login in the right place --- .../templates/nginx/conf.d/matrix-domain.conf.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 index 0d234827..1c3e6e0f 100644 --- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 +++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 @@ -39,6 +39,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 /.well-known/matrix { root {{ matrix_static_files_base_path }};