mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-11 19:44:53 +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>
85 lines
3.4 KiB
YAML
85 lines
3.4 KiB
YAML
# SPDX-FileCopyrightText: 2023 - 2025 Slavi Pantaleev
|
|
# SPDX-FileCopyrightText: 2025 Suguru Hirahara
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
- name: Ensure Matrix.to path exists
|
|
ansible.builtin.file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
mode: "0750"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
with_items:
|
|
- "{{ matrix_matrixto_base_path }}"
|
|
|
|
- name: Ensure Matrix.to support files installed
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/{{ item }}.j2"
|
|
dest: "{{ matrix_matrixto_base_path }}/{{ item }}"
|
|
mode: "0640"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
with_items:
|
|
- env
|
|
- labels
|
|
register: matrix_matrixto_support_files_result
|
|
|
|
- name: Ensure Matrix.to repository is present on self-build
|
|
ansible.builtin.git:
|
|
repo: "{{ matrix_matrixto_container_image_self_build_repo }}"
|
|
version: "{{ matrix_matrixto_container_image_self_build_repo_version }}"
|
|
dest: "{{ matrix_matrixto_container_image_self_build_src_files_path }}"
|
|
force: "yes"
|
|
register: matrix_matrixto_git_pull_results
|
|
|
|
- name: Ensure Matrix.to container image is built
|
|
community.docker.docker_image_build:
|
|
name: "{{ matrix_matrixto_container_image_self_build_name }}"
|
|
dockerfile: Dockerfile
|
|
path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}"
|
|
pull: true
|
|
rebuild: "{{ 'always' if matrix_matrixto_git_pull_results.changed | bool else 'never' }}"
|
|
register: matrix_matrixto_container_image_build_result
|
|
|
|
- name: Ensure Matrix.to container network is created via community.docker.docker_network
|
|
when:
|
|
- devture_systemd_docker_base_container_network_creation_method == 'ansible-module'
|
|
- matrix_matrixto_container_network != 'host'
|
|
community.docker.docker_network:
|
|
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
|
|
name: "{{ matrix_matrixto_container_network }}"
|
|
driver: bridge
|
|
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
|
|
|
|
- name: Ensure Matrix.to container network is created via ansible.builtin.command
|
|
when:
|
|
- devture_systemd_docker_base_container_network_creation_method == 'command'
|
|
- matrix_matrixto_container_network != 'host'
|
|
ansible.builtin.command:
|
|
cmd: >-
|
|
{{ devture_systemd_docker_base_host_command_docker }} network create
|
|
{% if devture_systemd_docker_base_ipv6_enabled %}--ipv6{% endif %}
|
|
{{ devture_systemd_docker_base_container_networks_driver_options_string }}
|
|
{{ matrix_matrixto_container_network }}
|
|
register: network_creation_result
|
|
changed_when: network_creation_result.rc == 0
|
|
failed_when: network_creation_result.rc != 0 and 'already exists' not in network_creation_result.stderr
|
|
|
|
- name: Ensure Matrix.to systemd service is present
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/systemd/matrix-matrixto.service.j2"
|
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_matrixto_identifier }}.service"
|
|
mode: "0644"
|
|
register: matrix_matrixto_systemd_service_result
|
|
|
|
- name: Determine whether Matrix.to needs a restart
|
|
ansible.builtin.set_fact:
|
|
matrix_matrixto_restart_necessary: >-
|
|
{{
|
|
matrix_matrixto_support_files_result.changed | default(false)
|
|
or matrix_matrixto_systemd_service_result.changed | default(false)
|
|
or matrix_matrixto_container_image_build_result.changed | default(false)
|
|
}}
|