Merge branch 'braid/matrix-ldap-registration-proxy' of https://github.com/TheOneWithTheBraid/matrix-docker-ansible-deploy into matrix-ldap-registration-proxy

roles/matrix-ldap-registration-proxy/tasks/init.yml

@@ -7,7 +7,7 @@
   when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_ldap_registration_proxy_container_image_self_build and matrix_ldap_registration_proxy_enabled | bool"
 
 - ansible.builtin.set_fact:
-    matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-matrix-ldap-registration-proxy.service'] }}"
+    matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-ldap-registration-proxy.service'] }}"
   when: matrix_ldap_registration_proxy_enabled | bool
 
 - block:
@@ -49,7 +49,7 @@
          NOTE: You've enabled the Matrix LDAP registration proxy bridge but are not using the matrix-nginx-proxy
          reverse proxy.
          Please make sure that you're proxying the `{{ matrix_ldap_registration_proxy_public_endpoint }}`
-         URL endpoint to the matrix-matrix-ldap-proxy container.
+         URL endpoint to the matrix-ldap-proxy container.
          You can expose the container's port using the `matrix_ldap_registration_proxy_container_http_host_bind_port` variable.
      when: "not matrix_nginx_proxy_enabled | default(False) | bool"
 

roles/matrix-ldap-registration-proxy/tasks/main.yml

@@ -5,19 +5,19 @@
     - always
 
 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
-  when: "run_setup | bool and matrix_matrix_ldap_registration_proxy_enabled | bool"
+  when: "run_setup | bool and matrix_ldap_registration_proxy_enabled | bool"
   tags:
     - setup-all
     - setup-matrix-ldap-registration-proxy
 
 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
-  when: "run_setup | bool and matrix_matrix_ldap_registration_proxy_enabled | bool"
+  when: "run_setup | bool and matrix_ldap_registration_proxy_enabled | bool"
   tags:
     - setup-all
     - setup-matrix-ldap-registration-proxy
 
 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
-  when: "run_setup | bool and not matrix_matrix_ldap_registration_proxy_enabled | bool"
+  when: "run_setup | bool and not matrix_ldap_registration_proxy_enabled | bool"
   tags:
     - setup-all
     - setup-matrix-ldap-registration-proxy

roles/matrix-ldap-registration-proxy/tasks/setup_uninstall.yml

@@ -3,7 +3,7 @@
 - name: Check existence of matrix-matrix_ldap_registration_proxy service
   ansible.builtin.stat:
     path: "{{ matrix_systemd_path }}/matrix-ldap-registration-proxy.service"
-  register: matrix_matrix_ldap_registration_proxy_service_stat
+  register: matrix_ldap_registration_proxy_service_stat
 
 - name: Ensure matrix-matrix_ldap_registration_proxy is stopped
   ansible.builtin.service:
@@ -12,25 +12,25 @@
     enabled: false
     daemon_reload: true
   register: stopping_result
-  when: "matrix_matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
+  when: "matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
 
 - name: Ensure matrix-ldap-registration-proxy.service doesn't exist
   ansible.builtin.file:
     path: "{{ matrix_systemd_path }}/matrix-ldap-registration-proxy.service"
     state: absent
-  when: "matrix_matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
+  when: "matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
 
 - name: Ensure systemd reloaded after matrix-ldap-registration-proxy.service removal
   ansible.builtin.service:
     daemon_reload: true
-  when: "matrix_matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
+  when: "matrix_ldap_registration_proxy_service_stat.stat.exists | bool"
 
 - name: Ensure Matrix matrix_ldap_registration_proxy paths don't exist
   ansible.builtin.file:
-    path: "{{ matrix_matrix_ldap_registration_proxy_base_path }}"
+    path: "{{ matrix_ldap_registration_proxy_base_path }}"
     state: absent
 
 - name: Ensure matrix_ldap_registration_proxy Docker image doesn't exist
   docker_image:
-    name: "{{ matrix_matrix_ldap_registration_proxy_docker_image }}"
+    name: "{{ matrix_ldap_registration_proxy_docker_image }}"
     state: absent