mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-10-24 15:24:14 +00:00
QEDeDandSlavi Pantaleev
7b44e13276
With conditional restart (install-* tags), the homeserver entry for Synapse fell through to `restart_necessary: true`, and the worker entries carried no flag at all, which systemd_service_manager also treats as "restart". Every install-all and install-service synapse therefore restarted Synapse and all of its workers, even when nothing had changed. Without workers, systemd also restarted most bridges and bots, whose units require matrix-synapse.service. Compute matrix_synapse_restart_necessary from the tasks that install what Synapse runs: homeserver.yaml, the initial config and signing key, the log config, labels and systemd service, the container image (pulled, self-built or customized), each worker's config, labels and systemd service, and the downloaded or cloned extension modules. Workers follow the same decision, as they read the same files. Synapse also mounts the appservice registration files written by other roles. Add matrix_homeserver_app_service_registration_changed in group_vars/matrix_servers, which checks the registered result of each task installing one of the files listed in matrix_homeserver_container_extra_arguments_auto, so that a changed registration still restarts Synapse and its workers. The double-puppet role did not register its result; it does now. The Synapse image pull and three extension downloads all registered their result as `result`. The downloads run first, so the pull's result overwrote theirs before the restart decision could read them; they now use role-prefixed names.
65 lines
2.7 KiB
YAML
65 lines
2.7 KiB
YAML
# SPDX-FileCopyrightText: 2019 - 2023 Slavi Pantaleev
|
|
# SPDX-FileCopyrightText: 2019 Michael Haak
|
|
# SPDX-FileCopyrightText: 2020 Christian Wolf
|
|
# SPDX-FileCopyrightText: 2022 Aaron Raimist
|
|
# SPDX-FileCopyrightText: 2022 Marko Weltzer
|
|
# SPDX-FileCopyrightText: 2022 Sebastian Gumprich
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
|
|
- name: Fail if Synapse Simple Antispam blocked homeservers is not set
|
|
ansible.builtin.fail:
|
|
msg: "Synapse Simple Antispam is enabled, but no blocked homeservers have been set in matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers"
|
|
when: "matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers | length == 0"
|
|
|
|
- name: Ensure git installed
|
|
ansible.builtin.package:
|
|
name: git
|
|
state: present
|
|
|
|
# A checkout owned by a different user (a uid change, an earlier clone by another user, etc.) would make the git task below fail on ownership or permissions.
|
|
- name: Ensure synapse-simple-antispam repository ownership is correct
|
|
ansible.builtin.file:
|
|
path: "{{ matrix_synapse_ext_path }}/synapse-simple-antispam"
|
|
state: directory
|
|
owner: "{{ matrix_synapse_uid }}"
|
|
group: "{{ matrix_synapse_gid }}"
|
|
recurse: true
|
|
|
|
- name: Clone synapse-simple-antispam git repository
|
|
ansible.builtin.git:
|
|
repo: "{{ matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_repository_url }}"
|
|
version: "{{ matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_version }}"
|
|
dest: "{{ matrix_synapse_ext_path }}/synapse-simple-antispam"
|
|
force: "yes"
|
|
become: true
|
|
become_user: "{{ matrix_synapse_username }}"
|
|
# Keep this even though the task above normalizes ownership. Git may still see an ownership mismatch when Ansible becomes an unprivileged user (see #5065).
|
|
environment:
|
|
GIT_CONFIG_COUNT: "1"
|
|
GIT_CONFIG_KEY_0: safe.directory
|
|
GIT_CONFIG_VALUE_0: "{{ matrix_synapse_ext_path }}/synapse-simple-antispam"
|
|
register: matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_result
|
|
|
|
- ansible.builtin.set_fact:
|
|
matrix_synapse_modules: >
|
|
{{
|
|
matrix_synapse_modules
|
|
+
|
|
[{
|
|
"module": "synapse_simple_antispam.AntiSpamInvites",
|
|
"config": {
|
|
"blocked_homeservers": matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers
|
|
}
|
|
}]
|
|
}}
|
|
|
|
matrix_synapse_container_extra_arguments: >
|
|
{{
|
|
matrix_synapse_container_extra_arguments | default([])
|
|
+
|
|
["--mount type=bind,src=" + matrix_synapse_ext_path + "/synapse-simple-antispam/synapse_simple_antispam,dst=" + matrix_synapse_in_container_python_packages_path + "/synapse_simple_antispam,ro"]
|
|
}}
|