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

14
roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml
View File

@@ -15,10 +15,10 @@
- name: Ensure Mautrix Twitter image is pulled
community.docker.docker_image:
name: "{{ matrix_mautrix_twitter_docker_image }}"
name: "{{ matrix_mautrix_twitter_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_mautrix_twitter_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_mautrix_twitter_docker_image_force_pull }}"
force_source: "{{ matrix_mautrix_twitter_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_mautrix_twitter_container_image_force_pull }}"
when: matrix_mautrix_twitter_enabled | bool and not matrix_mautrix_twitter_container_image_self_build
register: matrix_mautrix_twitter_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -36,14 +36,14 @@
- {path: "{{ matrix_mautrix_twitter_base_path }}", when: true}
- {path: "{{ matrix_mautrix_twitter_config_path }}", when: true}
- {path: "{{ matrix_mautrix_twitter_data_path }}", when: true}
- {path: "{{ matrix_mautrix_twitter_docker_src_files_path }}", when: "{{ matrix_mautrix_twitter_container_image_self_build }}"}
- {path: "{{ matrix_mautrix_twitter_container_src_files_path }}", when: "{{ matrix_mautrix_twitter_container_image_self_build }}"}
when: item.when | bool
- name: Ensure Mautrix Twitter repository is present on self-build
ansible.builtin.git:
repo: "{{ matrix_mautrix_twitter_container_image_self_build_repo }}"
version: "{{ matrix_mautrix_twitter_container_image_self_build_repo_version }}"
dest: "{{ matrix_mautrix_twitter_docker_src_files_path }}"
dest: "{{ matrix_mautrix_twitter_container_src_files_path }}"
force: "yes"
become: true
become_user: "{{ matrix_user_name }}"
@@ -52,12 +52,12 @@
- name: Ensure Mautrix Twitter Docker image is built
community.docker.docker_image:
name: "{{ matrix_mautrix_twitter_docker_image }}"
name: "{{ matrix_mautrix_twitter_container_image }}"
source: build
force_source: "{{ matrix_mautrix_twitter_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_mautrix_twitter_docker_src_files_path }}"
path: "{{ matrix_mautrix_twitter_container_src_files_path }}"
pull: true
when: "matrix_mautrix_twitter_enabled | bool and matrix_mautrix_twitter_container_image_self_build | bool"

36
roles/custom/matrix-bridge-mautrix-twitter/tasks/validate_config.yml
View File

@@ -7,20 +7,6 @@
---
- name: Fail if required mautrix-twitter settings not defined
ansible.builtin.fail:
msg: >-
You need to define a required configuration setting (`{{ item.name }}`).
when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
with_items:
- {'name': 'matrix_mautrix_twitter_appservice_token', when: true}
- {'name': 'matrix_mautrix_twitter_homeserver_address', when: true}
- {'name': 'matrix_mautrix_twitter_homeserver_token', when: true}
- {'name': 'matrix_mautrix_twitter_database_hostname', when: "{{ matrix_mautrix_twitter_database_engine == 'postgres' }}"}
- {'name': 'matrix_mautrix_twitter_container_network', when: true}
- {'name': 'matrix_mautrix_twitter_metrics_proxying_hostname', when: "{{ matrix_mautrix_twitter_metrics_proxying_enabled }}"}
- {'name': 'matrix_mautrix_twitter_metrics_proxying_path_prefix', when: "{{ matrix_mautrix_twitter_metrics_proxying_enabled }}"}
- name: (Deprecation) Catch and report renamed mautrix-twitter variables
ansible.builtin.fail:
msg: >-
@@ -35,4 +21,24 @@
- {'old': 'matrix_mautrix_twitter_bridge_login_shared_secret_map_custom', 'new': 'matrix_mautrix_twitter_double_puppet_secrets_custom'}
- {'old': 'matrix_mautrix_twitter_federate_rooms', 'new': 'matrix_mautrix_twitter_matrix_federate_rooms'}
- {'old': 'matrix_mautrix_twitter_command_prefix', 'new': 'matrix_mautrix_twitter_bridge_command_prefix'}
- {'old': 'matrix_mautrix_twitter_docker_image_name_prefix', 'new': 'matrix_mautrix_twitter_docker_image_registry_prefix'}
- {'old': 'matrix_mautrix_twitter_docker_image_name_prefix', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix'}
- {'old': 'matrix_mautrix_twitter_docker_image', 'new': 'matrix_mautrix_twitter_container_image'}
- {'old': 'matrix_mautrix_twitter_docker_image_force_pull', 'new': 'matrix_mautrix_twitter_container_image_force_pull'}
- {'old': 'matrix_mautrix_twitter_docker_image_registry_prefix', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix'}
- {'old': 'matrix_mautrix_twitter_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix_upstream'}
- {'old': 'matrix_mautrix_twitter_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_mautrix_twitter_docker_src_files_path', 'new': 'matrix_mautrix_twitter_container_src_files_path'}
- name: Fail if required mautrix-twitter settings not defined
ansible.builtin.fail:
msg: >-
You need to define a required configuration setting (`{{ item.name }}`).
when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
with_items:
- {'name': 'matrix_mautrix_twitter_appservice_token', when: true}
- {'name': 'matrix_mautrix_twitter_homeserver_address', when: true}
- {'name': 'matrix_mautrix_twitter_homeserver_token', when: true}
- {'name': 'matrix_mautrix_twitter_database_hostname', when: "{{ matrix_mautrix_twitter_database_engine == 'postgres' }}"}
- {'name': 'matrix_mautrix_twitter_container_network', when: true}
- {'name': 'matrix_mautrix_twitter_metrics_proxying_hostname', when: "{{ matrix_mautrix_twitter_metrics_proxying_enabled }}"}
- {'name': 'matrix_mautrix_twitter_metrics_proxying_path_prefix', when: "{{ matrix_mautrix_twitter_metrics_proxying_enabled }}"}