5
0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-07-18 23:59:34 +00:00

Rename matrix_appservice_irc_* variables to matrix_bridge_appservice_irc_*

Part of adopting a uniform naming policy for bridge variables,
where the variable prefix matches the role directory name.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
2026-07-16 14:47:01 +03:00
parent dc16f09e78
commit 98269653b2
11 changed files with 277 additions and 277 deletions
@@ -26,18 +26,18 @@
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
with_items:
- {path: "{{ matrix_appservice_irc_base_path }}", when: true}
- {path: "{{ matrix_appservice_irc_config_path }}", when: true}
- {path: "{{ matrix_appservice_irc_data_path }}", when: true}
- {path: "{{ matrix_appservice_irc_container_src_files_path }}", when: "{{ matrix_appservice_irc_container_image_self_build }}"}
- {path: "{{ matrix_bridge_appservice_irc_base_path }}", when: true}
- {path: "{{ matrix_bridge_appservice_irc_config_path }}", when: true}
- {path: "{{ matrix_bridge_appservice_irc_data_path }}", when: true}
- {path: "{{ matrix_bridge_appservice_irc_container_src_files_path }}", when: "{{ matrix_bridge_appservice_irc_container_image_self_build }}"}
when: item.when | bool
- name: Check if an old passkey file already exists
ansible.builtin.stat:
path: "{{ matrix_appservice_irc_base_path }}/passkey.pem"
register: matrix_appservice_irc_stat_passkey
path: "{{ matrix_bridge_appservice_irc_base_path }}/passkey.pem"
register: matrix_bridge_appservice_irc_stat_passkey
- when: "matrix_appservice_irc_stat_passkey.stat.exists"
- when: "matrix_bridge_appservice_irc_stat_passkey.stat.exists"
block:
- name: (Data relocation) Ensure matrix-appservice-irc.service is stopped
ansible.builtin.service:
@@ -48,104 +48,104 @@
- name: (Data relocation) Move AppService IRC passkey.pem file to ./data directory
ansible.builtin.command:
cmd: "mv {{ matrix_appservice_irc_base_path }}/passkey.pem {{ matrix_appservice_irc_data_path }}/passkey.pem"
register: matrix_appservice_irc_move_passkey_result
changed_when: matrix_appservice_irc_move_passkey_result.rc == 0
cmd: "mv {{ matrix_bridge_appservice_irc_base_path }}/passkey.pem {{ matrix_bridge_appservice_irc_data_path }}/passkey.pem"
register: matrix_bridge_appservice_irc_move_passkey_result
changed_when: matrix_bridge_appservice_irc_move_passkey_result.rc == 0
- name: (Data relocation) Move AppService IRC database files to ./data directory
ansible.builtin.command:
cmd: "mv {{ matrix_appservice_irc_base_path }}/{{ item }} {{ matrix_appservice_irc_data_path }}/{{ item }}"
register: matrix_appservice_irc_move_dbs_result
changed_when: matrix_appservice_irc_move_dbs_result.rc == 0
cmd: "mv {{ matrix_bridge_appservice_irc_base_path }}/{{ item }} {{ matrix_bridge_appservice_irc_data_path }}/{{ item }}"
register: matrix_bridge_appservice_irc_move_dbs_result
changed_when: matrix_bridge_appservice_irc_move_dbs_result.rc == 0
with_items:
- rooms.db
- users.db
failed_when: false
- ansible.builtin.set_fact:
matrix_appservice_irc_migration_requires_restart: false
matrix_bridge_appservice_irc_migration_requires_restart: false
- when: "matrix_appservice_irc_database_engine == 'postgres'"
- when: "matrix_bridge_appservice_irc_database_engine == 'postgres'"
block:
- name: Check if a nedb database already exists
ansible.builtin.stat:
path: "{{ matrix_appservice_irc_data_path }}/users.db"
register: matrix_appservice_irc_nedb_database_path_local_stat_result
path: "{{ matrix_bridge_appservice_irc_data_path }}/users.db"
register: matrix_bridge_appservice_irc_nedb_database_path_local_stat_result
- when: "matrix_appservice_irc_nedb_database_path_local_stat_result.stat.exists | bool"
- when: "matrix_bridge_appservice_irc_nedb_database_path_local_stat_result.stat.exists | bool"
block:
- ansible.builtin.include_tasks: "{{ role_path }}/tasks/migrate_nedb_to_postgres.yml"
- ansible.builtin.set_fact:
matrix_appservice_irc_migration_requires_restart: true
matrix_bridge_appservice_irc_migration_requires_restart: true
- name: Ensure Appservice IRC image is pulled
community.docker.docker_image_pull:
name: "{{ matrix_appservice_irc_container_image }}"
name: "{{ matrix_bridge_appservice_irc_container_image }}"
pull: always
when: "matrix_appservice_irc_enabled | bool and not matrix_appservice_irc_container_image_self_build | bool"
register: matrix_appservice_irc_container_image_pull_result
when: "matrix_bridge_appservice_irc_enabled | bool and not matrix_bridge_appservice_irc_container_image_self_build | bool"
register: matrix_bridge_appservice_irc_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}"
until: matrix_appservice_irc_container_image_pull_result is not failed
until: matrix_bridge_appservice_irc_container_image_pull_result is not failed
- name: Ensure matrix-appservice-irc repository is present when self-building
ansible.builtin.git:
repo: "{{ matrix_appservice_irc_container_repo }}"
version: "{{ matrix_appservice_irc_container_repo_version }}"
dest: "{{ matrix_appservice_irc_container_src_files_path }}"
repo: "{{ matrix_bridge_appservice_irc_container_repo }}"
version: "{{ matrix_bridge_appservice_irc_container_repo_version }}"
dest: "{{ matrix_bridge_appservice_irc_container_src_files_path }}"
force: "yes"
become: true
become_user: "{{ matrix_user_name }}"
register: matrix_appservice_irc_git_pull_results
when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool"
register: matrix_bridge_appservice_irc_git_pull_results
when: "matrix_bridge_appservice_irc_enabled | bool and matrix_bridge_appservice_irc_container_image_self_build | bool"
- name: Ensure matrix-appservice-irc Docker image is built
community.docker.docker_image_build:
name: "{{ matrix_appservice_irc_container_image }}"
name: "{{ matrix_bridge_appservice_irc_container_image }}"
dockerfile: Dockerfile
path: "{{ matrix_appservice_irc_container_src_files_path }}"
path: "{{ matrix_bridge_appservice_irc_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_appservice_irc_git_pull_results.changed | bool else 'never' }}"
when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool and matrix_appservice_irc_git_pull_results.changed"
register: matrix_appservice_irc_container_image_build_result
rebuild: "{{ 'always' if matrix_bridge_appservice_irc_git_pull_results.changed | bool else 'never' }}"
when: "matrix_bridge_appservice_irc_enabled | bool and matrix_bridge_appservice_irc_container_image_self_build | bool and matrix_bridge_appservice_irc_git_pull_results.changed"
register: matrix_bridge_appservice_irc_container_image_build_result
- name: Ensure Matrix Appservice IRC config installed
ansible.builtin.copy:
content: "{{ matrix_appservice_irc_configuration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_appservice_irc_config_path }}/config.yaml"
content: "{{ matrix_bridge_appservice_irc_configuration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_bridge_appservice_irc_config_path }}/config.yaml"
mode: '0644'
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
register: matrix_appservice_irc_config_result
register: matrix_bridge_appservice_irc_config_result
- name: Ensure Matrix Appservice IRC labels file installed
ansible.builtin.template:
src: "{{ role_path }}/templates/labels.j2"
dest: "{{ matrix_appservice_irc_base_path }}/labels"
dest: "{{ matrix_bridge_appservice_irc_base_path }}/labels"
mode: '0644'
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
register: matrix_appservice_irc_labels_result
register: matrix_bridge_appservice_irc_labels_result
- name: Generate Appservice IRC passkey if it doesn't exist
ansible.builtin.shell:
cmd: "{{ matrix_host_command_openssl }} genpkey -out {{ matrix_appservice_irc_data_path }}/passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048"
creates: "{{ matrix_appservice_irc_data_path }}/passkey.pem"
cmd: "{{ matrix_host_command_openssl }} genpkey -out {{ matrix_bridge_appservice_irc_data_path }}/passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048"
creates: "{{ matrix_bridge_appservice_irc_data_path }}/passkey.pem"
become: true
become_user: "{{ matrix_user_name }}"
- name: Check if an authenticated media signing key exists
ansible.builtin.stat:
path: "{{ matrix_appservice_irc_data_path }}/auth-media.jwk"
register: matrix_appservice_irc_stat_auth_media_key
path: "{{ matrix_bridge_appservice_irc_data_path }}/auth-media.jwk"
register: matrix_bridge_appservice_irc_stat_auth_media_key
- when: not matrix_appservice_irc_stat_auth_media_key.stat.exists
- when: not matrix_bridge_appservice_irc_stat_auth_media_key.stat.exists
block:
- name: Generate IRC appservice signing key for authenticated media
community.docker.docker_container:
name: "create-auth-media-jwk-key"
image: "{{ matrix_appservice_irc_container_image }}"
image: "{{ matrix_bridge_appservice_irc_container_image }}"
cleanup: true
network_mode: none
entrypoint: "/usr/local/bin/node"
@@ -160,12 +160,12 @@
}
main().then(() => process.exit(0)).catch(err => { throw err });"
detach: false
register: matrix_appservice_irc_jwk_result
register: matrix_bridge_appservice_irc_jwk_result
- name: Write auth media signing key to file
ansible.builtin.copy:
content: "{{ matrix_appservice_irc_jwk_result.container.Output }}"
dest: "{{ matrix_appservice_irc_data_path }}/auth-media.jwk"
content: "{{ matrix_bridge_appservice_irc_jwk_result.container.Output }}"
dest: "{{ matrix_bridge_appservice_irc_data_path }}/auth-media.jwk"
mode: "0644"
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
@@ -174,7 +174,7 @@
# Fix it.
- name: (Migration) Ensure Appservice IRC passkey permissions are okay
ansible.builtin.file:
path: "{{ matrix_appservice_irc_data_path }}/passkey.pem"
path: "{{ matrix_bridge_appservice_irc_data_path }}/passkey.pem"
mode: '0644'
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
@@ -203,10 +203,10 @@
{{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-appservice-irc-gen
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
--cap-drop=ALL
--mount type=bind,src={{ matrix_appservice_irc_config_path }},dst=/config
--mount type=bind,src={{ matrix_appservice_irc_data_path }},dst=/data
--mount type=bind,src={{ matrix_bridge_appservice_irc_config_path }},dst=/config
--mount type=bind,src={{ matrix_bridge_appservice_irc_data_path }},dst=/data
--entrypoint=/bin/bash
{{ matrix_appservice_irc_container_image }}
{{ matrix_bridge_appservice_irc_container_image }}
-c
'node app.js
-r
@@ -218,37 +218,37 @@
- name: Read Appservice IRC registration-template.yaml
ansible.builtin.slurp:
src: "{{ matrix_appservice_irc_config_path }}/registration-template.yaml"
register: matrix_appservice_irc_registration_template_slurp
src: "{{ matrix_bridge_appservice_irc_config_path }}/registration-template.yaml"
register: matrix_bridge_appservice_irc_registration_template_slurp
- name: Remove unnecessary Appservice IRC registration-template.yaml
ansible.builtin.file:
path: "{{ matrix_appservice_irc_config_path }}/registration-template.yaml"
path: "{{ matrix_bridge_appservice_irc_config_path }}/registration-template.yaml"
state: absent
changed_when: false
- name: Parse registration-template.yaml
ansible.builtin.set_fact:
matrix_appservice_irc_registration_template: "{{ matrix_appservice_irc_registration_template_slurp['content'] | b64decode | from_yaml }}"
matrix_bridge_appservice_irc_registration_template: "{{ matrix_bridge_appservice_irc_registration_template_slurp['content'] | b64decode | from_yaml }}"
- name: Combine registration-template.yaml and own registration override config
ansible.builtin.set_fact:
matrix_appservice_irc_registration: "{{ matrix_appservice_irc_registration_template | combine(matrix_appservice_irc_registration_override, recursive=True) }}"
matrix_bridge_appservice_irc_registration: "{{ matrix_bridge_appservice_irc_registration_template | combine(matrix_bridge_appservice_irc_registration_override, recursive=True) }}"
- name: Ensure Appservice IRC registration.yaml installed
ansible.builtin.copy:
content: "{{ matrix_appservice_irc_registration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_appservice_irc_config_path }}/registration.yaml"
content: "{{ matrix_bridge_appservice_irc_registration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_bridge_appservice_irc_config_path }}/registration.yaml"
mode: '0644'
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
register: matrix_appservice_irc_registration_result
register: matrix_bridge_appservice_irc_registration_result
- name: Ensure matrix-appservice-irc container network is created
when: matrix_appservice_irc_container_network != 'host'
when: matrix_bridge_appservice_irc_container_network != 'host'
community.general.docker_network:
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
name: "{{ matrix_appservice_irc_container_network }}"
name: "{{ matrix_bridge_appservice_irc_container_network }}"
driver: bridge
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
@@ -257,19 +257,19 @@
src: "{{ role_path }}/templates/systemd/matrix-appservice-irc.service.j2"
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-appservice-irc.service"
mode: '0644'
register: matrix_appservice_irc_systemd_service_result
register: matrix_bridge_appservice_irc_systemd_service_result
- name: Determine whether matrix-appservice-irc needs a restart
ansible.builtin.set_fact:
matrix_appservice_irc_restart_necessary: >-
matrix_bridge_appservice_irc_restart_necessary: >-
{{
matrix_appservice_irc_migration_requires_restart | default(false)
or matrix_appservice_irc_config_result.changed | default(false)
or matrix_appservice_irc_labels_result.changed | default(false)
or matrix_appservice_irc_registration_result.changed | default(false)
or matrix_appservice_irc_systemd_service_result.changed | default(false)
or matrix_appservice_irc_container_image_pull_result.changed | default(false)
or matrix_appservice_irc_container_image_build_result.changed | default(false)
matrix_bridge_appservice_irc_migration_requires_restart | default(false)
or matrix_bridge_appservice_irc_config_result.changed | default(false)
or matrix_bridge_appservice_irc_labels_result.changed | default(false)
or matrix_bridge_appservice_irc_registration_result.changed | default(false)
or matrix_bridge_appservice_irc_systemd_service_result.changed | default(false)
or matrix_bridge_appservice_irc_container_image_pull_result.changed | default(false)
or matrix_bridge_appservice_irc_container_image_build_result.changed | default(false)
}}
- name: Ensure matrix-appservice-irc.service restarted, if necessary
@@ -277,4 +277,4 @@
name: "matrix-appservice-irc.service"
state: restarted
daemon_reload: true
when: "matrix_appservice_irc_migration_requires_restart | bool"
when: "matrix_bridge_appservice_irc_migration_requires_restart | bool"