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

10
roles/custom/matrix-corporal/tasks/setup_install.yml
View File

@@ -28,7 +28,7 @@
ansible.builtin.git:
repo: "{{ matrix_corporal_container_image_self_build_repo }}"
dest: "{{ matrix_corporal_container_src_files_path }}"
version: "{{ matrix_corporal_docker_image.split(':')[1] }}"
version: "{{ matrix_corporal_container_image.split(':')[1] }}"
force: "yes"
become: true
become_user: "{{ matrix_user_name }}"
@@ -37,7 +37,7 @@
- name: Ensure Matrix Corporal Docker image is built
community.docker.docker_image:
name: "{{ matrix_corporal_docker_image }}"
name: "{{ matrix_corporal_container_image }}"
source: build
force_source: "{{ matrix_corporal_git_pull_results.changed 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_corporal_git_pull_results.changed }}"
@@ -49,10 +49,10 @@
- name: Ensure Matrix Corporal Docker image is pulled
community.docker.docker_image:
name: "{{ matrix_corporal_docker_image }}"
name: "{{ matrix_corporal_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_corporal_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_corporal_docker_image_force_pull }}"
force_source: "{{ matrix_corporal_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_corporal_container_image_force_pull }}"
when: not matrix_corporal_container_image_self_build | bool
register: matrix_corporal_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"

28
roles/custom/matrix-corporal/tasks/validate_config.yml
View File

@@ -6,6 +6,23 @@
---
- name: (Deprecation) Catch and report renamed corporal variables
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_corporal_container_expose_ports', 'new': '<superseded by matrix_corporal_container_http_gateway_host_bind_port and matrix_corporal_container_http_api_host_bind_port>'}
- {'old': 'matrix_corporal_reconciliation_user_id_local_part', 'new': 'matrix_corporal_corporal_user_id_local_part'}
- {'old': 'matrix_corporal_container_image_name_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'}
- {'old': 'matrix_corporal_docker_image', 'new': 'matrix_corporal_container_image'}
- {'old': 'matrix_corporal_docker_image_force_pull', 'new': 'matrix_corporal_container_image_force_pull'}
- {'old': 'matrix_corporal_docker_image_registry_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'}
- {'old': 'matrix_corporal_docker_image_registry_prefix_upstream', 'new': 'matrix_corporal_container_image_registry_prefix_upstream'}
- {'old': 'matrix_corporal_docker_image_registry_prefix_upstream_default', 'new': 'matrix_corporal_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_corporal_docker_image_tag', 'new': 'matrix_corporal_container_image_tag'}
- name: Fail if required matrix-corporal settings not defined
ansible.builtin.fail:
msg: >-
@@ -22,14 +39,3 @@
ansible.builtin.fail:
msg: "The Matrix Corporal HTTP API is enabled (`matrix_corporal_http_api_enabled`), but no auth token has been set in `matrix_corporal_http_api_auth_token`"
when: "matrix_corporal_http_api_enabled | bool and matrix_corporal_http_api_auth_token == ''"
- name: (Deprecation) Catch and report renamed corporal variables
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_corporal_container_expose_ports', 'new': '<superseded by matrix_corporal_container_http_gateway_host_bind_port and matrix_corporal_container_http_api_host_bind_port>'}
- {'old': 'matrix_corporal_reconciliation_user_id_local_part', 'new': 'matrix_corporal_corporal_user_id_local_part'}
- {'old': 'matrix_corporal_container_image_name_prefix', 'new': 'matrix_corporal_docker_image_registry_prefix'}