More progress on matrix-static-files role and cleaning up of matrix-base and matrix-nginx-proxy

roles/custom/matrix-nginx-proxy/defaults/main.yml

@@ -568,15 +568,6 @@ matrix_nginx_proxy_ssl_ciphers: "{{ matrix_nginx_proxy_ssl_presets[matrix_nginx_
 # you may wish to set this to '$proxy_add_x_forwarded_for' instead.
 matrix_nginx_proxy_x_forwarded_for: '$remote_addr'
 
-# Controls whether the self-check feature should validate SSL certificates.
-matrix_nginx_proxy_self_check_validate_certificates: true
-
-# Controls whether redirects will be followed when checking the `/.well-known/matrix/client` resource.
-#
-# As per the spec (https://matrix.org/docs/spec/client_server/r0.6.0#well-known-uri), it shouldn't be,
-# so we default to not following redirects as well.
-matrix_nginx_proxy_self_check_well_known_matrix_client_follow_redirects: none
-
 # For OCSP purposes, we need to define a resolver at the `server{}` level or `http{}` level (we do the latter).
 #
 # Otherwise, we get warnings like this:

roles/custom/matrix-nginx-proxy/tasks/setup_well_known.yml

@@ -1,25 +0,0 @@
----
-- ansible.builtin.set_fact:
-    matrix_well_known_file_path: "{{ matrix_static_files_base_path }}/.well-known/matrix/client"
-
-# We need others to be able to read these directories too,
-# so that matrix-nginx-proxy's nginx user can access the files.
-#
-# For running with another webserver, we recommend being part of the `matrix` group.
-- name: Ensure Matrix static-files path exists
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0755
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-  with_items:
-    - "{{ matrix_static_files_base_path }}/.well-known/matrix"
-
-- name: Ensure Matrix /.well-known/matrix/client configured
-  ansible.builtin.template:
-    src: "{{ role_path }}/templates/well-known/matrix-client.j2"
-    dest: "{{ matrix_static_files_base_path }}/.well-known/matrix"
-    mode: 0644
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"

roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-base-domain.conf.j2

@@ -24,17 +24,6 @@
 	{% for configuration_block in matrix_nginx_proxy_proxy_domain_additional_server_configuration_blocks %}
 		{{- configuration_block }}
 	{% endfor %}
-
-	location /.well-known/matrix {
-		root {{ matrix_static_files_base_path }};
-		{#
-			A somewhat long expires value is used to prevent outages
-			in case this is unreachable due to network failure.
-		#}
-		expires 4h;
-		default_type application/json;
-		add_header Access-Control-Allow-Origin *;
-	}
 {% endmacro %}
 
 server {

roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2

@@ -29,18 +29,6 @@
 
 	add_header X-XSS-Protection "{{ matrix_nginx_proxy_xss_protection }}";
 
-	location /.well-known/matrix {
-		root {{ matrix_static_files_base_path }};
-		{#
-			A somewhat long expires value is used to prevent outages
-			in case this is unreachable due to network failure or
-			due to the base domain's server completely dying.
-		#}
-		expires 4h;
-		default_type application/json;
-		add_header Access-Control-Allow-Origin *;
-	}
-
 	{% if matrix_nginx_proxy_proxy_matrix_nginx_status_enabled %}
 		{{ render_nginx_status_location_block(matrix_nginx_proxy_proxy_matrix_nginx_status_allowed_addresses) }}
 	{% endif %}

roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2

@@ -41,7 +41,6 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% if matrix_ssl_retrieval_method != 'none' %}
 			--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst={{ matrix_ssl_config_dir_path }},ro \
 			{% endif %}
-			--mount type=bind,src={{ matrix_static_files_base_path }},dst={{ matrix_static_files_base_path }},ro \
 			{% for volume in matrix_nginx_proxy_container_additional_volumes %}
 			-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
 			{% endfor %}