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:
@@ -380,3 +380,13 @@ matrix_hookshot_registration_extension: "{{ matrix_hookshot_registration_extensi
|
||||
# Holds the final registration (a combination of the default and its extension).
|
||||
# You most likely don't need to touch this variable. Instead, see `matrix_hookshot_registration_yaml`.
|
||||
matrix_hookshot_registration: "{{ matrix_hookshot_registration_yaml | from_yaml | combine(matrix_hookshot_registration_extension, recursive=True) }}"
|
||||
|
||||
# matrix_hookshot_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_hookshot_restart_necessary: false
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
force_source: "{{ matrix_hookshot_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_hookshot_docker_image_force_pull }}"
|
||||
when: not matrix_hookshot_container_image_self_build
|
||||
register: result
|
||||
register: matrix_hookshot_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_hookshot_container_image_pull_result is not failed
|
||||
|
||||
- name: Ensure hookshot repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
@@ -83,6 +83,7 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_name }}"
|
||||
group: "{{ matrix_group_name }}"
|
||||
register: matrix_hookshot_config_result
|
||||
|
||||
- name: Validate hookshot config.yml
|
||||
ansible.builtin.command:
|
||||
@@ -109,6 +110,7 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_name }}"
|
||||
group: "{{ matrix_group_name }}"
|
||||
register: matrix_hookshot_registration_result
|
||||
|
||||
- name: Ensure hookshot github private key file installed if github is enabled
|
||||
ansible.builtin.copy:
|
||||
@@ -118,6 +120,7 @@
|
||||
owner: "{{ matrix_user_name }}"
|
||||
group: "{{ matrix_group_name }}"
|
||||
when: matrix_hookshot_github_enabled | bool and matrix_hookshot_github_private_key|length > 0
|
||||
register: matrix_hookshot_github_key_result
|
||||
|
||||
- name: Ensure matrix-hookshot container network is created
|
||||
community.general.docker_network:
|
||||
@@ -135,9 +138,23 @@
|
||||
group: "{{ matrix_group_name }}"
|
||||
with_items:
|
||||
- labels
|
||||
register: matrix_hookshot_support_files_result
|
||||
|
||||
- name: Ensure matrix-hookshot.service installed
|
||||
ansible.builtin.template:
|
||||
src: "{{ role_path }}/templates/systemd/matrix-hookshot.service.j2"
|
||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-hookshot.service"
|
||||
mode: 0644
|
||||
register: matrix_hookshot_systemd_service_result
|
||||
|
||||
- name: Determine whether matrix-hookshot needs a restart
|
||||
ansible.builtin.set_fact:
|
||||
matrix_hookshot_restart_necessary: >-
|
||||
{{
|
||||
matrix_hookshot_config_result.changed | default(false)
|
||||
or matrix_hookshot_registration_result.changed | default(false)
|
||||
or matrix_hookshot_github_key_result.changed | default(false)
|
||||
or matrix_hookshot_support_files_result.changed | default(false)
|
||||
or matrix_hookshot_systemd_service_result.changed | default(false)
|
||||
or matrix_hookshot_container_image_pull_result.changed | default(false)
|
||||
}}
|
||||
|
||||
Reference in New Issue
Block a user