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>
63 lines
2.5 KiB
YAML
63 lines
2.5 KiB
YAML
# SPDX-FileCopyrightText: 2025 - 2026 luschmar
|
|
# SPDX-FileCopyrightText: 2026 Slavi Pantaleev
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
|
|
- name: Ensure matrix-meshtastic-relay image is pulled
|
|
community.docker.docker_image_pull:
|
|
name: "{{ matrix_meshtastic_relay_container_image }}"
|
|
pull: always
|
|
register: matrix_meshtastic_relay_container_image_pull_result
|
|
retries: "{{ devture_playbook_help_container_retries_count }}"
|
|
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
|
until: matrix_meshtastic_relay_container_image_pull_result is not failed
|
|
|
|
- name: Ensure matrix-meshtastic-relay paths exist
|
|
ansible.builtin.file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
mode: '0750'
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
with_items:
|
|
- "{{ matrix_meshtastic_relay_base_path }}"
|
|
- "{{ matrix_meshtastic_relay_config_path }}"
|
|
- "{{ matrix_meshtastic_relay_data_path }}"
|
|
|
|
- name: Ensure matrix-meshtastic-relay config.yaml is installed
|
|
ansible.builtin.copy:
|
|
content: "{{ matrix_meshtastic_relay_configuration | to_nice_yaml(indent=2, width=999999) }}"
|
|
dest: "{{ matrix_meshtastic_relay_config_path }}/config.yaml"
|
|
mode: '0600'
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
register: matrix_meshtastic_relay_config_result
|
|
|
|
- name: Ensure matrix-meshtastic-relay container network is created
|
|
when:
|
|
- matrix_meshtastic_relay_connection_type != 'ble'
|
|
- matrix_meshtastic_relay_container_network != 'host'
|
|
community.general.docker_network:
|
|
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
|
|
name: "{{ matrix_meshtastic_relay_container_network }}"
|
|
driver: bridge
|
|
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
|
|
|
|
- name: Ensure matrix-meshtastic-relay.service installed
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/systemd/matrix-meshtastic-relay.service.j2"
|
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-meshtastic-relay.service"
|
|
mode: '0644'
|
|
register: matrix_meshtastic_relay_systemd_service_result
|
|
|
|
- name: Determine whether matrix-meshtastic-relay needs a restart
|
|
ansible.builtin.set_fact:
|
|
matrix_meshtastic_relay_restart_necessary: >-
|
|
{{
|
|
matrix_meshtastic_relay_config_result.changed | default(false)
|
|
or matrix_meshtastic_relay_systemd_service_result.changed | default(false)
|
|
or matrix_meshtastic_relay_container_image_pull_result.changed | default(false)
|
|
}}
|