mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-10-28 13:57:57 +01:00 
			
		
		
		
	fix: all praise the allmighty yamllinter
This commit is contained in:
		| @@ -1,3 +1,4 @@ | ||||
| --- | ||||
| # See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070 | ||||
| # and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407 | ||||
| - name: Fail if trying to self-build on Ansible < 2.8 | ||||
| @@ -10,49 +11,49 @@ | ||||
|   when: matrix_registration_enabled|bool | ||||
|  | ||||
| - block: | ||||
|   - name: Fail if matrix-nginx-proxy role already executed | ||||
|     fail: | ||||
|       msg: >- | ||||
|         Trying to append matrix-registration's reverse-proxying configuration to matrix-nginx-proxy, | ||||
|         but it's pointless since the matrix-nginx-proxy role had already executed. | ||||
|         To fix this, please change the order of roles in your playbook, | ||||
|         so that the matrix-nginx-proxy role would run after the matrix-registration role. | ||||
|     when: matrix_nginx_proxy_role_executed|default(False)|bool | ||||
|     - name: Fail if matrix-nginx-proxy role already executed | ||||
|       fail: | ||||
|         msg: >- | ||||
|           Trying to append matrix-registration's reverse-proxying configuration to matrix-nginx-proxy, | ||||
|           but it's pointless since the matrix-nginx-proxy role had already executed. | ||||
|           To fix this, please change the order of roles in your playbook, | ||||
|           so that the matrix-nginx-proxy role would run after the matrix-registration role. | ||||
|       when: matrix_nginx_proxy_role_executed|default(False)|bool | ||||
|  | ||||
|   - name: Generate matrix-registration proxying configuration for matrix-nginx-proxy | ||||
|     set_fact: | ||||
|       matrix_registration_matrix_nginx_proxy_configuration: | | ||||
|         rewrite ^{{ matrix_registration_public_endpoint }}$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/ permanent; | ||||
|         rewrite ^{{ matrix_registration_public_endpoint }}/$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/register redirect; | ||||
|     - name: Generate matrix-registration proxying configuration for matrix-nginx-proxy | ||||
|       set_fact: | ||||
|         matrix_registration_matrix_nginx_proxy_configuration: | | ||||
|           rewrite ^{{ matrix_registration_public_endpoint }}$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/ permanent; | ||||
|           rewrite ^{{ matrix_registration_public_endpoint }}/$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/register redirect; | ||||
|  | ||||
|         location ~ ^{{ matrix_registration_public_endpoint }}/(.*) { | ||||
|         {% if matrix_nginx_proxy_enabled|default(False) %} | ||||
|           {# Use the embedded DNS resolver in Docker containers to discover the service #} | ||||
|           resolver 127.0.0.11 valid=5s; | ||||
|           set $backend "matrix-registration:5000"; | ||||
|           proxy_pass http://$backend/$1; | ||||
|         {% else %} | ||||
|           {# Generic configuration for use outside of our container setup #} | ||||
|           proxy_pass http://127.0.0.1:8767/$1; | ||||
|         {% endif %} | ||||
|           location ~ ^{{ matrix_registration_public_endpoint }}/(.*) { | ||||
|           {% if matrix_nginx_proxy_enabled|default(False) %} | ||||
|             {# Use the embedded DNS resolver in Docker containers to discover the service #} | ||||
|             resolver 127.0.0.11 valid=5s; | ||||
|             set $backend "matrix-registration:5000"; | ||||
|             proxy_pass http://$backend/$1; | ||||
|           {% else %} | ||||
|             {# Generic configuration for use outside of our container setup #} | ||||
|             proxy_pass http://127.0.0.1:8767/$1; | ||||
|           {% endif %} | ||||
|  | ||||
|           {# | ||||
|             Workaround matrix-registration serving the background image at /static | ||||
|             (see https://github.com/ZerataX/matrix-registration/issues/47) | ||||
|           #} | ||||
|           sub_filter_once off; | ||||
|           sub_filter_types text/css; | ||||
|           sub_filter "/static/" "{{ matrix_registration_public_endpoint }}/static/"; | ||||
|         } | ||||
|             {# | ||||
|               Workaround matrix-registration serving the background image at /static | ||||
|               (see https://github.com/ZerataX/matrix-registration/issues/47) | ||||
|             #} | ||||
|             sub_filter_once off; | ||||
|             sub_filter_types text/css; | ||||
|             sub_filter "/static/" "{{ matrix_registration_public_endpoint }}/static/"; | ||||
|           } | ||||
|  | ||||
|   - name: Register matrix-registration proxying configuration with matrix-nginx-proxy | ||||
|     set_fact: | ||||
|       matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: | | ||||
|         {{ | ||||
|           matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([]) | ||||
|           + | ||||
|           [matrix_registration_matrix_nginx_proxy_configuration] | ||||
|         }} | ||||
|     - name: Register matrix-registration proxying configuration with matrix-nginx-proxy | ||||
|       set_fact: | ||||
|         matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: | | ||||
|           {{ | ||||
|             matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([]) | ||||
|             + | ||||
|             [matrix_registration_matrix_nginx_proxy_configuration] | ||||
|           }} | ||||
|   tags: | ||||
|     - always | ||||
|   when: matrix_registration_enabled|bool | ||||
|   | ||||
		Reference in New Issue
	
	Block a user