mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-11 11:34:52 +03:00
Kevin Veen-Birkenbach
bd6e08a93e
* feat: support container_network=host across all roles + systemd templates
Mirror the pattern Slavi introduced for matrix-coturn (aafa8f0) across the
fork: every 'Ensure X container network is created' task gets a
'when: <var> not in ["", "host"]' guard so MDAD does not try to
docker_network create a network literally named 'host' (returns 403,
since host is a pre-defined Docker network).
Mirror the same guard in every systemd unit template that does
'ExecStartPre=docker network connect <addnet> <container>' loops over
matrix_<role>_container_additional_networks: skip the connects when the
container is on host networking (where additional --network attaches
are invalid).
Unblocks DiD setups where MDAD-managed containers share their host's
network namespace (matrix-mdad outer compose service joined to central
postgres/openldap networks) to reach external services on the outer
Docker daemon.
* Simplify container network guards (!= 'host') and fix duplicate when
Guarding on the empty string ('') as well was misleading: systemd unit
templates still render an unconditional --network= flag, so an empty
network value produces a broken docker create command. Only 'host' is
actually supported, so only guard on that. This also matches the
existing convention in the Traefik role
(when: traefik_container_network != 'host').
Also fix a duplicate when key in the meshtastic-relay role, where the
network-creation task already had a when condition - the two are now
combined into a list.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
102 lines
4.2 KiB
YAML
102 lines
4.2 KiB
YAML
# SPDX-FileCopyrightText: 2021 Aaron Raimist
|
|
# SPDX-FileCopyrightText: 2022 - 2024 Slavi Pantaleev
|
|
# SPDX-FileCopyrightText: 2022 Jim Myhrberg
|
|
# SPDX-FileCopyrightText: 2022 Marko Weltzer
|
|
# SPDX-FileCopyrightText: 2022 Nikita Chernyi
|
|
# SPDX-FileCopyrightText: 2022 Sebastian Gumprich
|
|
# SPDX-FileCopyrightText: 2024 David Mehren
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
|
|
- ansible.builtin.set_fact:
|
|
matrix_bot_mjolnir_migration_requires_restart: false
|
|
|
|
- name: Ensure matrix-bot-mjolnir paths exist
|
|
ansible.builtin.file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
mode: '0750'
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
with_items:
|
|
- {path: "{{ matrix_bot_mjolnir_base_path }}", when: true}
|
|
- {path: "{{ matrix_bot_mjolnir_config_path }}", when: true}
|
|
- {path: "{{ matrix_bot_mjolnir_data_path }}", when: true}
|
|
- {path: "{{ matrix_bot_mjolnir_container_src_files_path }}", when: "{{ matrix_bot_mjolnir_container_image_self_build }}"}
|
|
when: "item.when | bool"
|
|
|
|
- name: Ensure mjolnir Docker image is pulled
|
|
community.docker.docker_image_pull:
|
|
name: "{{ matrix_bot_mjolnir_container_image }}"
|
|
pull: always
|
|
when: "not matrix_bot_mjolnir_container_image_self_build | bool"
|
|
register: matrix_bot_mjolnir_container_image_pull_result
|
|
retries: "{{ devture_playbook_help_container_retries_count }}"
|
|
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
|
until: matrix_bot_mjolnir_container_image_pull_result is not failed
|
|
|
|
- name: Ensure mjolnir repository is present on self-build
|
|
ansible.builtin.git:
|
|
repo: "{{ matrix_bot_mjolnir_container_image_self_build_repo }}"
|
|
dest: "{{ matrix_bot_mjolnir_container_src_files_path }}"
|
|
version: "{{ matrix_bot_mjolnir_container_image.split(':')[1] }}"
|
|
force: "yes"
|
|
become: true
|
|
become_user: "{{ matrix_user_name }}"
|
|
register: matrix_bot_mjolnir_git_pull_results
|
|
when: "matrix_bot_mjolnir_container_image_self_build | bool"
|
|
|
|
- name: Ensure mjolnir Docker image is built
|
|
community.docker.docker_image_build:
|
|
name: "{{ matrix_bot_mjolnir_container_image }}"
|
|
dockerfile: Dockerfile
|
|
path: "{{ matrix_bot_mjolnir_container_src_files_path }}"
|
|
pull: true
|
|
rebuild: "{{ 'always' if matrix_bot_mjolnir_git_pull_results.changed | bool else 'never' }}"
|
|
when: "matrix_bot_mjolnir_container_image_self_build | bool"
|
|
register: matrix_bot_mjolnir_container_image_build_result
|
|
|
|
- name: Ensure matrix-bot-mjolnir config installed
|
|
ansible.builtin.copy:
|
|
content: "{{ matrix_bot_mjolnir_configuration | to_nice_yaml(indent=2, width=999999) }}"
|
|
dest: "{{ matrix_bot_mjolnir_config_path }}/production.yaml"
|
|
mode: '0644'
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
register: matrix_bot_mjolnir_config_result
|
|
|
|
- name: Ensure matrix-bot-mjolnir container network is created
|
|
when: matrix_bot_mjolnir_container_network != 'host'
|
|
community.general.docker_network:
|
|
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
|
|
name: "{{ matrix_bot_mjolnir_container_network }}"
|
|
driver: bridge
|
|
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
|
|
|
|
- name: Ensure matrix-bot-mjolnir.service installed
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/systemd/matrix-bot-mjolnir.service.j2"
|
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-mjolnir.service"
|
|
mode: '0644'
|
|
register: matrix_bot_mjolnir_systemd_service_result
|
|
|
|
- name: Determine whether Mjolnir needs a restart
|
|
ansible.builtin.set_fact:
|
|
matrix_bot_mjolnir_restart_necessary: >-
|
|
{{
|
|
matrix_bot_mjolnir_migration_requires_restart | default(false)
|
|
or matrix_bot_mjolnir_config_result.changed | default(false)
|
|
or matrix_bot_mjolnir_systemd_service_result.changed | default(false)
|
|
or matrix_bot_mjolnir_container_image_pull_result.changed | default(false)
|
|
or matrix_bot_mjolnir_container_image_build_result.changed | default(false)
|
|
}}
|
|
|
|
- name: Ensure matrix-bot-mjolnir.service restarted, if necessary
|
|
ansible.builtin.service:
|
|
name: "matrix-bot-mjolnir.service"
|
|
state: restarted
|
|
daemon_reload: true
|
|
when: "matrix_bot_mjolnir_migration_requires_restart | bool"
|