mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-02-28 18:03:10 +00:00
Add conditional restart support to client, bot, and bridge roles
For each of the 34 roles (3 clients, 9 bots, 22 bridges), this commit: - Adds `_restart_necessary: false` default variable - Adds `register:` directives to config/image/systemd tasks - Computes `_restart_necessary` via set_fact (OR of all .changed results) - Wires `(_restart_necessary | bool)` in group_vars/matrix_servers This allows the systemd service manager to skip unnecessary restarts when running install-* tags and nothing actually changed. Service roles and complex multi-service roles will follow separately. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -222,3 +222,13 @@ matrix_mautrix_gmessages_registration_yaml: |
|
||||
io.element.msc4190: {{ matrix_mautrix_gmessages_msc4190_enabled | to_json }}
|
||||
|
||||
matrix_mautrix_gmessages_registration: "{{ matrix_mautrix_gmessages_registration_yaml | from_yaml }}"
|
||||
|
||||
# matrix_mautrix_gmessages_restart_necessary controls whether the service
|
||||
# will be restarted (when true) or merely started (when false) by the
|
||||
# systemd service manager role (when conditional restart is enabled).
|
||||
#
|
||||
# This value is automatically computed during installation based on whether
|
||||
# any configuration files, the systemd service file, or the container image changed.
|
||||
# The default of `false` means "no restart needed" — appropriate when the role's
|
||||
# installation tasks haven't run (e.g., due to --tags skipping them).
|
||||
matrix_mautrix_gmessages_restart_necessary: false
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
force_source: "{{ matrix_mautrix_gmessages_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_gmessages_docker_image_force_pull }}"
|
||||
when: not matrix_mautrix_gmessages_container_image_self_build
|
||||
register: result
|
||||
register: matrix_mautrix_gmessages_container_image_pull_result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
||||
until: result is not failed
|
||||
until: matrix_mautrix_gmessages_container_image_pull_result is not failed
|
||||
|
||||
- name: Ensure Mautrix gmessages repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
@@ -124,6 +124,7 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_name }}"
|
||||
group: "{{ matrix_group_name }}"
|
||||
register: matrix_mautrix_gmessages_config_result
|
||||
|
||||
- name: Ensure mautrix-gmessages registration.yaml installed
|
||||
ansible.builtin.copy:
|
||||
@@ -132,12 +133,14 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_name }}"
|
||||
group: "{{ matrix_group_name }}"
|
||||
register: matrix_mautrix_gmessages_registration_result
|
||||
|
||||
- name: Ensure matrix-mautrix-gmessages.service installed
|
||||
ansible.builtin.template:
|
||||
src: "{{ role_path }}/templates/systemd/matrix-mautrix-gmessages.service.j2"
|
||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-gmessages.service"
|
||||
mode: 0644
|
||||
register: matrix_mautrix_gmessages_systemd_service_result
|
||||
|
||||
- name: Ensure mautrix-gmessages support files installed
|
||||
ansible.builtin.template:
|
||||
@@ -148,6 +151,7 @@
|
||||
group: "{{ matrix_group_name }}"
|
||||
with_items:
|
||||
- labels
|
||||
register: matrix_mautrix_gmessages_support_files_result
|
||||
|
||||
- name: Ensure matrix-mautrix-gmessages container network is created
|
||||
community.general.docker_network:
|
||||
@@ -156,6 +160,18 @@
|
||||
driver: bridge
|
||||
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
|
||||
|
||||
- name: Determine whether matrix-mautrix-gmessages needs a restart
|
||||
ansible.builtin.set_fact:
|
||||
matrix_mautrix_gmessages_restart_necessary: >-
|
||||
{{
|
||||
matrix_mautrix_gmessages_migration_requires_restart | default(false)
|
||||
or matrix_mautrix_gmessages_config_result.changed | default(false)
|
||||
or matrix_mautrix_gmessages_registration_result.changed | default(false)
|
||||
or matrix_mautrix_gmessages_support_files_result.changed | default(false)
|
||||
or matrix_mautrix_gmessages_systemd_service_result.changed | default(false)
|
||||
or matrix_mautrix_gmessages_container_image_pull_result.changed | default(false)
|
||||
}}
|
||||
|
||||
- name: Ensure matrix-mautrix-gmessages.service restarted, if necessary
|
||||
ansible.builtin.service:
|
||||
name: "matrix-mautrix-gmessages.service"
|
||||
|
||||
Reference in New Issue
Block a user