5
0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-07-17 15:26:41 +00:00

Rename matrix_meshtastic_relay_* variables to matrix_bridge_meshtastic_relay_*

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:57:34 +03:00
parent 4d6b68a5da
commit 97077e2f13
8 changed files with 141 additions and 141 deletions
@@ -11,15 +11,15 @@
- install-all
- install-meshtastic-relay
block:
- when: matrix_meshtastic_relay_enabled | bool
- when: matrix_bridge_meshtastic_relay_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
- when: matrix_meshtastic_relay_enabled | bool
- when: matrix_bridge_meshtastic_relay_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
- tags:
- setup-all
- setup-meshtastic-relay
block:
- when: not matrix_meshtastic_relay_enabled | bool
- when: not matrix_bridge_meshtastic_relay_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
@@ -7,12 +7,12 @@
- name: Ensure matrix-meshtastic-relay image is pulled
community.docker.docker_image_pull:
name: "{{ matrix_meshtastic_relay_container_image }}"
name: "{{ matrix_bridge_meshtastic_relay_container_image }}"
pull: always
register: matrix_meshtastic_relay_container_image_pull_result
register: matrix_bridge_meshtastic_relay_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}"
until: matrix_meshtastic_relay_container_image_pull_result is not failed
until: matrix_bridge_meshtastic_relay_container_image_pull_result is not failed
- name: Ensure matrix-meshtastic-relay paths exist
ansible.builtin.file:
@@ -22,26 +22,26 @@
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
with_items:
- "{{ matrix_meshtastic_relay_base_path }}"
- "{{ matrix_meshtastic_relay_config_path }}"
- "{{ matrix_meshtastic_relay_data_path }}"
- "{{ matrix_bridge_meshtastic_relay_base_path }}"
- "{{ matrix_bridge_meshtastic_relay_config_path }}"
- "{{ matrix_bridge_meshtastic_relay_data_path }}"
- name: Ensure matrix-meshtastic-relay config.yaml is installed
ansible.builtin.copy:
content: "{{ matrix_meshtastic_relay_configuration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_meshtastic_relay_config_path }}/config.yaml"
content: "{{ matrix_bridge_meshtastic_relay_configuration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_bridge_meshtastic_relay_config_path }}/config.yaml"
mode: '0600'
owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}"
register: matrix_meshtastic_relay_config_result
register: matrix_bridge_meshtastic_relay_config_result
- name: Ensure matrix-meshtastic-relay container network is created
when:
- matrix_meshtastic_relay_connection_type != 'ble'
- matrix_meshtastic_relay_container_network != 'host'
- matrix_bridge_meshtastic_relay_connection_type != 'ble'
- matrix_bridge_meshtastic_relay_container_network != 'host'
community.general.docker_network:
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
name: "{{ matrix_meshtastic_relay_container_network }}"
name: "{{ matrix_bridge_meshtastic_relay_container_network }}"
driver: bridge
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
@@ -50,13 +50,13 @@
src: "{{ role_path }}/templates/systemd/matrix-meshtastic-relay.service.j2"
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-meshtastic-relay.service"
mode: '0644'
register: matrix_meshtastic_relay_systemd_service_result
register: matrix_bridge_meshtastic_relay_systemd_service_result
- name: Determine whether matrix-meshtastic-relay needs a restart
ansible.builtin.set_fact:
matrix_meshtastic_relay_restart_necessary: >-
matrix_bridge_meshtastic_relay_restart_necessary: >-
{{
matrix_meshtastic_relay_config_result.changed | default(false)
or matrix_meshtastic_relay_systemd_service_result.changed | default(false)
or matrix_meshtastic_relay_container_image_pull_result.changed | default(false)
matrix_bridge_meshtastic_relay_config_result.changed | default(false)
or matrix_bridge_meshtastic_relay_systemd_service_result.changed | default(false)
or matrix_bridge_meshtastic_relay_container_image_pull_result.changed | default(false)
}}
@@ -8,9 +8,9 @@
- name: Check existence of matrix-meshtastic-relay service
ansible.builtin.stat:
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-meshtastic-relay.service"
register: matrix_meshtastic_relay_service_stat
register: matrix_bridge_meshtastic_relay_service_stat
- when: matrix_meshtastic_relay_service_stat.stat.exists | bool
- when: matrix_bridge_meshtastic_relay_service_stat.stat.exists | bool
block:
- name: Ensure matrix-meshtastic-relay is stopped
ansible.builtin.service:
@@ -11,16 +11,16 @@
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_meshtastic_relay_matrix_host', when: true}
- {'name': 'matrix_meshtastic_relay_matrix_bot_password', when: true}
- {'name': 'matrix_meshtastic_relay_connection_type', when: true}
- {'name': 'matrix_bridge_meshtastic_relay_matrix_host', when: true}
- {'name': 'matrix_bridge_meshtastic_relay_matrix_bot_password', when: true}
- {'name': 'matrix_bridge_meshtastic_relay_connection_type', when: true}
- name: Fail if matrix_meshtastic_relay_connection_type is invalid
- name: Fail if matrix_bridge_meshtastic_relay_connection_type is invalid
ansible.builtin.fail:
msg: >-
`matrix_meshtastic_relay_connection_type` must be one of: `tcp`, `serial`, `ble`.
Got: `{{ matrix_meshtastic_relay_connection_type }}`.
when: "matrix_meshtastic_relay_connection_type not in ['tcp', 'serial', 'ble']"
`matrix_bridge_meshtastic_relay_connection_type` must be one of: `tcp`, `serial`, `ble`.
Got: `{{ matrix_bridge_meshtastic_relay_connection_type }}`.
when: "matrix_bridge_meshtastic_relay_connection_type not in ['tcp', 'serial', 'ble']"
- name: (Deprecation) Catch and report renamed matrix-meshtastic-relay variables
ansible.builtin.fail:
@@ -28,4 +28,4 @@
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_meshtastic_relay_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- {'old': 'matrix_bridge_meshtastic_relay_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}