| @@ -189,15 +189,15 @@ | |||||
| {% if matrix_nginx_proxy_enabled %} | {% if matrix_nginx_proxy_enabled %} | ||||
| {# Use the embedded DNS resolver in Docker containers to discover the service #} | {# Use the embedded DNS resolver in Docker containers to discover the service #} | ||||
| resolver {{ matrix_nginx_proxy_http_level_resolver }} valid=5s; | resolver {{ matrix_nginx_proxy_http_level_resolver }} valid=5s; | ||||
| set $backend "{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_with_container }}"; | |||||
| {% if matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| set $backend "{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_with_container }}"; | |||||
| {% if matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| proxy_pass http://$backend; | proxy_pass http://$backend; | ||||
| {% else %} | {% else %} | ||||
| {% if matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| {% if matrix_nginx_proxy_proxy_matrix_user_directory_search_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| {# Generic configuration for use outside of our container setup #} | {# Generic configuration for use outside of our container setup #} | ||||
| proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_sans_container }}; | proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_sans_container }}; | ||||
| {% endif %} | {% endif %} | ||||
| @@ -213,14 +213,14 @@ | |||||
| {# Use the embedded DNS resolver in Docker containers to discover the service #} | {# Use the embedded DNS resolver in Docker containers to discover the service #} | ||||
| resolver {{ matrix_nginx_proxy_http_level_resolver }} valid=5s; | resolver {{ matrix_nginx_proxy_http_level_resolver }} valid=5s; | ||||
| set $backend "{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_with_container }}"; | set $backend "{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_with_container }}"; | ||||
| {% if matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| {% if matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| proxy_pass http://$backend; | proxy_pass http://$backend; | ||||
| {% else %} | {% else %} | ||||
| {% if matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| {% if matrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled %} | |||||
| rewrite ^(.*?)/v3/(.*?)$ $1/r0/$2 break; | |||||
| {% endif %} | |||||
| {# Generic configuration for use outside of our container setup #} | {# Generic configuration for use outside of our container setup #} | ||||
| proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_sans_container }}; | proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_sans_container }}; | ||||
| {% endif %} | {% endif %} | ||||