mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-11 03:24: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>
101 lines
4.3 KiB
YAML
101 lines
4.3 KiB
YAML
# SPDX-FileCopyrightText: 2024 David Mehren
|
|
# SPDX-FileCopyrightText: 2024 Slavi Pantaleev
|
|
#
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
---
|
|
|
|
- name: Ensure matrix-cactus-comments-client paths exist
|
|
ansible.builtin.file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
mode: '0750'
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
with_items:
|
|
- {path: "{{ matrix_cactus_comments_client_base_path }}", when: true}
|
|
- {path: "{{ matrix_cactus_comments_client_public_path }}", when: true}
|
|
when: "item.when | bool"
|
|
|
|
- name: Ensure matrix-cactus-comments-client is configured
|
|
ansible.builtin.template:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ item.dest }}"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
mode: '0644'
|
|
with_items:
|
|
- src: "{{ role_path }}/templates/env.j2"
|
|
dest: "{{ matrix_cactus_comments_client_base_path }}/env"
|
|
|
|
- src: "{{ role_path }}/templates/labels.j2"
|
|
dest: "{{ matrix_cactus_comments_client_base_path }}/labels"
|
|
register: matrix_cactus_comments_client_support_files_result
|
|
|
|
- when: matrix_cactus_comments_client_local_dir | length == 0
|
|
block:
|
|
- name: Download web client js
|
|
ansible.builtin.get_url:
|
|
url: "{{ matrix_cactus_comments_client_webclient_js_url }}"
|
|
dest: "{{ matrix_cactus_comments_client_public_path }}/cactus.js"
|
|
mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
- name: Download web client css
|
|
ansible.builtin.get_url:
|
|
url: "{{ matrix_cactus_comments_client_webclient_css_url }}"
|
|
dest: "{{ matrix_cactus_comments_client_public_path }}/style.css"
|
|
mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
|
|
- when: matrix_cactus_comments_client_local_dir | length > 0
|
|
block:
|
|
- name: Upload locally distributed client JS
|
|
ansible.builtin.copy:
|
|
src: "{{ matrix_cactus_comments_client_local_dir }}/src/cactus.js"
|
|
dest: "{{ matrix_cactus_comments_client_public_path }}/cactus.js"
|
|
mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
- name: Upload locally distributed client CSS
|
|
ansible.builtin.copy:
|
|
src: "{{ matrix_cactus_comments_client_local_dir }}/src/style.css"
|
|
dest: "{{ matrix_cactus_comments_client_public_path }}/style.css"
|
|
mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}"
|
|
owner: "{{ matrix_user_name }}"
|
|
group: "{{ matrix_group_name }}"
|
|
|
|
- name: Ensure matrix-cactus-comments-client container image is pulled
|
|
community.docker.docker_image_pull:
|
|
name: "{{ matrix_cactus_comments_client_container_image }}"
|
|
pull: always
|
|
register: matrix_cactus_comments_client_container_image_pull_result
|
|
retries: "{{ devture_playbook_help_container_retries_count }}"
|
|
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
|
until: matrix_cactus_comments_client_container_image_pull_result is not failed
|
|
|
|
- name: Ensure matrix-cactus-comments-client container network is created
|
|
when: matrix_cactus_comments_client_container_network != 'host'
|
|
community.general.docker_network:
|
|
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
|
|
name: "{{ matrix_cactus_comments_client_container_network }}"
|
|
driver: bridge
|
|
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
|
|
|
|
- name: Ensure matrix-cactus-comments-client.service installed
|
|
ansible.builtin.template:
|
|
src: "{{ role_path }}/templates/systemd/matrix-cactus-comments-client.service.j2"
|
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-cactus-comments-client.service"
|
|
mode: '0644'
|
|
register: matrix_cactus_comments_client_systemd_service_result
|
|
|
|
- name: Determine whether matrix-cactus-comments-client needs a restart
|
|
ansible.builtin.set_fact:
|
|
matrix_cactus_comments_client_restart_necessary: >-
|
|
{{
|
|
matrix_cactus_comments_client_support_files_result.changed | default(false)
|
|
or matrix_cactus_comments_client_systemd_service_result.changed | default(false)
|
|
or matrix_cactus_comments_client_container_image_pull_result.changed | default(false)
|
|
}}
|