cqrenet/matrix-docker-ansible-deploy
3
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-02-28 09:53:09 +00:00
Code Issues Wiki Activity

Rename _docker_ vars to _container_ across 34 roles

Browse Source 
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>
This commit is contained in:
Slavi Pantaleev
2026-02-18 07:58:15 +02:00
parent 78d9f725b3
commit f0e0f5ec56
137 changed files with 1003 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/custom/matrix-conduit/tasks/setup_install.yml
View File

@@ -51,10 +51,10 @@
- name: Ensure Conduit container image is pulled
community.docker.docker_image:
name: "{{ matrix_conduit_docker_image }}"
name: "{{ matrix_conduit_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_conduit_docker_image_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_conduit_docker_image_force_pull }}"
force_source: "{{ matrix_conduit_container_image_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_conduit_container_image_force_pull }}"
register: result
retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}"

22
roles/custom/matrix-conduit/tasks/validate_config.yml
View File

@@ -4,6 +4,20 @@
---
- name: (Deprecation) Catch and report renamed Conduit variables
ansible.builtin.fail:
msg: >-
The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
with_items:
- {'old': 'matrix_conduit_container_image_name_prefix', 'new': 'matrix_conduit_container_image_registry_prefix'}
- {'old': 'matrix_conduit_docker_image', 'new': 'matrix_conduit_container_image'}
- {'old': 'matrix_conduit_docker_image_force_pull', 'new': 'matrix_conduit_container_image_force_pull'}
- {'old': 'matrix_conduit_docker_image_registry_prefix', 'new': 'matrix_conduit_container_image_registry_prefix'}
- {'old': 'matrix_conduit_docker_image_registry_prefix_upstream', 'new': 'matrix_conduit_container_image_registry_prefix_upstream'}
- {'old': 'matrix_conduit_docker_image_registry_prefix_upstream_default', 'new': 'matrix_conduit_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_conduit_docker_image_tag', 'new': 'matrix_conduit_container_image_tag'}
- name: Fail if required Conduit settings not defined
ansible.builtin.fail:
msg: >-
@@ -13,11 +27,3 @@
- {'name': 'matrix_conduit_hostname', when: true}
- {'name': 'matrix_conduit_container_network', when: true}
- {'name': 'matrix_conduit_container_labels_internal_client_api_traefik_entrypoints', when: "{{ matrix_conduit_container_labels_internal_client_api_enabled }}"}
- name: (Deprecation) Catch and report renamed Conduit variables
ansible.builtin.fail:
msg: >-
The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
with_items:
- {'old': 'matrix_conduit_container_image_name_prefix', 'new': 'matrix_conduit_docker_image_registry_prefix'}