Rename _docker_ vars to _container_ across 34 roles

Roles affected: appservice-discord, appservice-irc, beeper-linkedin,
heisenbridge, hookshot, mautrix-bluesky, mautrix-discord,
mautrix-gmessages, mautrix-googlechat, mautrix-signal, mautrix-slack,
mautrix-twitter, mautrix-whatsapp, mautrix-wsproxy, mx-puppet-groupme,
mx-puppet-steam, postmoogle, sms, steam, cactus-comments, element,
fluffychat, schildichat, conduit, corporal, dendrite,
ldap-registration-proxy, media-repo, pantalaimon,
prometheus-nginxlog-exporter, registration, sygnal, synapse-admin,
user-verification-service.

For each role: renamed _docker_image* variables to _container_image*
(and _docker_src_files_path to _container_src_files_path where
applicable), added deprecation entries in validate_config.yml, and
updated group_vars/docs references.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

roles/custom/matrix-ldap-registration-proxy/defaults/main.yml

@@ -12,10 +12,10 @@ matrix_ldap_registration_proxy_enabled: true
 
 matrix_ldap_registration_proxy_hostname: ''
 
-matrix_ldap_registration_proxy_docker_image: "{{ matrix_ldap_registration_proxy_docker_image_registry_prefix }}matrix_ldap_registration_proxy"
-matrix_ldap_registration_proxy_docker_image_registry_prefix: "{{ 'localhost/' if matrix_ldap_registration_proxy_container_image_self_build else matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream }}"
-matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream: "{{ matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream_default }}"
-matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream_default: ""
+matrix_ldap_registration_proxy_container_image: "{{ matrix_ldap_registration_proxy_container_image_registry_prefix }}matrix_ldap_registration_proxy"
+matrix_ldap_registration_proxy_container_image_registry_prefix: "{{ 'localhost/' if matrix_ldap_registration_proxy_container_image_self_build else matrix_ldap_registration_proxy_container_image_registry_prefix_upstream }}"
+matrix_ldap_registration_proxy_container_image_registry_prefix_upstream: "{{ matrix_ldap_registration_proxy_container_image_registry_prefix_upstream_default }}"
+matrix_ldap_registration_proxy_container_image_registry_prefix_upstream_default: ""
 
 matrix_ldap_registration_proxy_container_image_self_build: true
 matrix_ldap_registration_proxy_container_image_self_build_repo: "https://gitlab.com/activism.international/matrix_ldap_registration_proxy.git"
@@ -25,7 +25,7 @@ matrix_ldap_registration_proxy_version: "296246afc6a9b3105e67fcf6621cf05ebc74b87
 
 matrix_ldap_registration_proxy_base_path: "{{ matrix_base_data_path }}/matrix_ldap_registration_proxy"
 # We need the docker src directory to be named matrix_ldap_registration_proxy.
-matrix_ldap_registration_proxy_docker_src_files_path: "{{ matrix_ldap_registration_proxy_base_path }}/docker-src/matrix_ldap_registration_proxy"
+matrix_ldap_registration_proxy_container_src_files_path: "{{ matrix_ldap_registration_proxy_base_path }}/docker-src/matrix_ldap_registration_proxy"
 matrix_ldap_registration_proxy_config_path: "{{ matrix_ldap_registration_proxy_base_path }}/config"
 
 matrix_ldap_registration_proxy_ldap_uri: ""

roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml

@@ -17,13 +17,13 @@
     group: "{{ matrix_group_name }}"
   with_items:
     - {path: "{{ matrix_ldap_registration_proxy_config_path }}", when: true}
-    - {path: "{{ matrix_ldap_registration_proxy_docker_src_files_path }}", when: true}
+    - {path: "{{ matrix_ldap_registration_proxy_container_src_files_path }}", when: true}
   when: "item.when | bool"
 
 - name: Ensure matrix_ldap_registration_proxy repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_ldap_registration_proxy_container_image_self_build_repo }}"
-    dest: "{{ matrix_ldap_registration_proxy_docker_src_files_path }}"
+    dest: "{{ matrix_ldap_registration_proxy_container_src_files_path }}"
     version: "{{ matrix_ldap_registration_proxy_container_image_self_build_branch }}"
     force: "yes"
   become: true
@@ -32,12 +32,12 @@
 
 - name: Ensure matrix_ldap_registration_proxy Docker image is built
   community.docker.docker_image:
-    name: "{{ matrix_ldap_registration_proxy_docker_image }}"
+    name: "{{ matrix_ldap_registration_proxy_container_image }}"
     source: build
     force_source: "{{ matrix_ldap_registration_proxy_git_pull_results.changed }}"
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_ldap_registration_proxy_docker_src_files_path }}"
+      path: "{{ matrix_ldap_registration_proxy_container_src_files_path }}"
       pull: true
   when: true
 

roles/custom/matrix-ldap-registration-proxy/tasks/validate_config.yml

@@ -7,6 +7,23 @@
 
 ---
 
+- name: (Deprecation) Catch and report renamed matrix-ldap-registration-proxy settings
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which now has a different name.
+      Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
+  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
+  with_items:
+    - {'old': 'matrix_ldap_registration_proxy_registration_addr_with_container', 'new': '<removed>'}
+    - {'old': 'matrix_ldap_registration_proxy_registration_addr_sans_container', 'new': '<removed>'}
+    - {'old': 'matrix_ldap_registration_proxy_container_port', 'new': 'matrix_ldap_registration_listen_port'}
+    - {'old': 'matrix_ldap_registration_proxy_registration_endpoint', 'new': 'matrix_ldap_registration_proxy_container_labels_registration_endpoint_path'}
+    - {'old': 'matrix_ldap_registration_proxy_docker_image', 'new': 'matrix_ldap_registration_proxy_container_image'}
+    - {'old': 'matrix_ldap_registration_proxy_docker_image_registry_prefix', 'new': 'matrix_ldap_registration_proxy_container_image_registry_prefix'}
+    - {'old': 'matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream', 'new': 'matrix_ldap_registration_proxy_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_ldap_registration_proxy_docker_image_registry_prefix_upstream_default', 'new': 'matrix_ldap_registration_proxy_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_ldap_registration_proxy_docker_src_files_path', 'new': 'matrix_ldap_registration_proxy_container_src_files_path'}
+
 - name: Fail if required matrix-ldap-registration-proxy settings not defined
   ansible.builtin.fail:
     msg: >-
@@ -19,15 +36,3 @@
     - "matrix_ldap_registration_proxy_ldap_user"
     - "matrix_ldap_registration_proxy_ldap_password"
     - "matrix_ldap_registration_proxy_container_network"
-
-- name: (Deprecation) Catch and report renamed matrix-ldap-registration-proxy settings
-  ansible.builtin.fail:
-    msg: >-
-      Your configuration contains a variable, which now has a different name.
-      Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
-  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
-  with_items:
-    - {'old': 'matrix_ldap_registration_proxy_registration_addr_with_container', 'new': '<removed>'}
-    - {'old': 'matrix_ldap_registration_proxy_registration_addr_sans_container', 'new': '<removed>'}
-    - {'old': 'matrix_ldap_registration_proxy_container_port', 'new': 'matrix_ldap_registration_listen_port'}
-    - {'old': 'matrix_ldap_registration_proxy_registration_endpoint', 'new': 'matrix_ldap_registration_proxy_container_labels_registration_endpoint_path'}

roles/custom/matrix-ldap-registration-proxy/templates/systemd/matrix-ldap-registration-proxy.service.j2

@@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_ldap_registration_proxy_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_ldap_registration_proxy_docker_image }}
+			{{ matrix_ldap_registration_proxy_container_image }}
 
 {% for network in matrix_ldap_registration_proxy_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-ldap-registration-proxy