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

fix /login for mautrix-hangouts bridge

Browse Source
This commit is contained in:
Eduardo Beltrame 2019-07-29 17:14:25 -07:00 committed by microchipster
parent 4528e6402b
commit ab6e808bc6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
View File

@ -192,12 +192,6 @@ server {
rewrite ^/$ /_matrix/static/ last; 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 %} {% if matrix_nginx_proxy_proxy_matrix_federation_api_enabled %}
@ -218,6 +212,13 @@ server {
ssl_protocols {{ matrix_nginx_proxy_ssl_protocols }}; ssl_protocols {{ matrix_nginx_proxy_ssl_protocols }};
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; 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 / { location / {
{% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}