Clean up some matrix_nginx_proxy_proxy_matrix_metrics_* references

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

@@ -1,60 +0,0 @@
----
-
-# When we're dealing with raw htpasswd content, we just store it in the file directly.
-- name: Ensure matrix-metrics-htpasswd is present when generated from raw content (protecting /metrics/* URIs)
-  ansible.builtin.copy:
-    content: "{{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_raw_content }}"
-    dest: "{{ matrix_nginx_proxy_data_path }}/matrix-metrics-htpasswd"
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-    mode: 0600
-  when: not matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_username
-
-# Alternatively, we need to use the `htpasswd` tool to generate the htpasswd file.
-# There's an Ansible module that helps with that, but it requires passlib (a Python module) to be installed on the server.
-# See: https://docs.ansible.com/ansible/2.3/htpasswd_module.html#requirements-on-host-that-executes-module
-# We support various distros, with various versions of Python. Installing additional Python modules can be a hassle.
-# As a workaround, we run `htpasswd` from an Apache container image.
-- when: matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_username != ''
-  block:
-    - name: Ensure Apache Docker image is pulled for generating matrix-metrics-htpasswd from username/password (protecting /metrics/* URIs)
-      community.docker.docker_image:
-        name: "{{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_apache_container_image }}"
-        source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-        force_source: "{{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_apache_container_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-        force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_apache_container_force_pull }}"
-      register: result
-      retries: "{{ devture_playbook_help_container_retries_count }}"
-      delay: "{{ devture_playbook_help_container_retries_delay }}"
-      until: result is not failed
-
-    # We store the password in a file and make the `htpasswd` tool read it from there,
-    # as opposed to passing it directly on stdin (which will expose it to other processes on the server).
-    - name: Store metrics password in a temporary file
-      ansible.builtin.copy:
-        content: "{{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_password }}"
-        dest: "/tmp/matrix-nginx-proxy-metrics-password"
-        mode: 0400
-        owner: "{{ matrix_user_uid }}"
-        group: "{{ matrix_user_gid }}"
-
-    - name: Generate matrix-metrics-htpasswd from username/password (protecting /metrics/* URIs)
-      ansible.builtin.command:
-        cmd: >-
-          {{ devture_systemd_docker_base_host_command_docker }} run
-          --rm
-          --user={{ matrix_user_uid }}:{{ matrix_user_gid }}
-          --cap-drop=ALL
-          --network=none
-          --mount type=bind,src={{ matrix_nginx_proxy_data_path }},dst=/data
-          --mount type=bind,src=/tmp/matrix-nginx-proxy-metrics-password,dst=/password,ro
-          --entrypoint=/bin/sh
-          {{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_apache_container_image }}
-          -c
-          'cat /password | htpasswd -i -c /data/matrix-metrics-htpasswd {{ matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_username }} && chmod 600 /data/matrix-metrics-htpasswd'
-      changed_when: true
-
-    - name: Delete temporary metrics password file
-      ansible.builtin.file:
-        path: /tmp/matrix-nginx-proxy-metrics-password
-        state: absent

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

@@ -37,10 +37,6 @@
     mode: 0644
   when: matrix_nginx_proxy_enabled | bool
 
-- name: Setup metrics
-  ansible.builtin.include_tasks: "{{ role_path }}/tasks/nginx-proxy/setup_metrics_auth.yml"
-  when: matrix_nginx_proxy_proxy_matrix_metrics_enabled | bool and matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled | bool
-
 - name: Ensure Matrix nginx-proxy configured (generic)
   ansible.builtin.template:
     src: "{{ role_path }}/templates/nginx/conf.d/nginx-http.conf.j2"
@@ -334,19 +330,8 @@
     state: absent
   when: "not matrix_nginx_proxy_enabled | bool"
 
-- name: Ensure Matrix nginx-proxy htpasswd is deleted (protecting /_synapse/metrics URI)
-  ansible.builtin.file:
-    path: "{{ matrix_nginx_proxy_data_path }}/matrix-synapse-metrics-htpasswd"
-    state: absent
-
 # This file is now generated by the matrix-synapse role and saved in the Synapse directory
 - name: (Cleanup) Ensure old sample prometheus.yml for external scraping is deleted
   ansible.builtin.file:
     path: "{{ matrix_base_data_path }}/external_prometheus.yml.example"
     state: absent
-
-- name: Ensure Matrix nginx-proxy htpasswd is deleted (protecting /metrics/* URIs)
-  ansible.builtin.file:
-    path: "{{ matrix_nginx_proxy_data_path }}/matrix-metrics-htpasswd"
-    state: absent
-  when: "not matrix_nginx_proxy_proxy_matrix_metrics_enabled | bool or not matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled | bool"

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

@@ -30,14 +30,6 @@
       `matrix_nginx_proxy_ssl_preset` needs to be set to a known value.
   when: "matrix_nginx_proxy_ssl_preset not in ['modern', 'intermediate', 'old']"
 
-- name: Fail if Basic Auth enabled for metrics, but no credentials supplied
-  ansible.builtin.fail:
-    msg: |
-      Enabling Basic Auth for metrics (`matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled`) requires:
-      - either a username/password (provided in `matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_username` and `matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_password`)
-      - or raw htpasswd content (provided in `matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_raw_content`)
-  when: "matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled | bool and (matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_raw_content == '' and (matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_username == '' or matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_password == ''))"
-
 - when: "matrix_ssl_retrieval_method == 'lets-encrypt'"
   block:
     - name: (Deprecation) Catch and report renamed settings