From 559cff05a86492a9f5f1db946f91b223d09688f0 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 10 Jun 2026 23:41:46 +0300 Subject: [PATCH] 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 --- roles/custom/matrix-alertmanager-receiver/tasks/install.yml | 2 +- .../systemd/matrix-alertmanager-receiver.service.j2 | 2 +- .../tasks/setup_install.yml | 2 +- .../systemd/matrix-appservice-draupnir-for-all.service.j2 | 2 +- roles/custom/matrix-authentication-service/tasks/install.yml | 2 +- .../systemd/matrix-authentication-service.service.j2 | 2 +- roles/custom/matrix-bot-baibot/tasks/install.yml | 2 +- .../templates/systemd/matrix-bot-baibot.service.j2 | 2 +- roles/custom/matrix-bot-buscarron/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-bot-buscarron.service.j2 | 2 +- roles/custom/matrix-bot-draupnir/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-bot-draupnir.service.j2 | 2 +- roles/custom/matrix-bot-honoroit/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-bot-honoroit.service.j2 | 2 +- .../tasks/setup_install.yml | 2 +- .../systemd/matrix-bot-matrix-registration-bot.service.j2 | 2 +- .../matrix-bot-matrix-reminder-bot/tasks/setup_install.yml | 2 +- .../systemd/matrix-bot-matrix-reminder-bot.service.j2 | 2 +- roles/custom/matrix-bot-maubot/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-bot-maubot.service.j2 | 2 +- roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-bot-mjolnir.service.j2 | 2 +- .../matrix-bridge-appservice-discord/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-appservice-discord.service.j2 | 2 +- .../matrix-bridge-appservice-irc/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-appservice-irc.service.j2 | 2 +- .../tasks/setup_install.yml | 2 +- .../systemd/matrix-appservice-kakaotalk-node.service.j2 | 2 +- .../templates/systemd/matrix-appservice-kakaotalk.service.j2 | 2 +- .../matrix-bridge-beeper-linkedin/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-beeper-linkedin.service.j2 | 2 +- .../matrix-bridge-heisenbridge/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-heisenbridge.service.j2 | 2 +- roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-hookshot.service.j2 | 2 +- .../matrix-bridge-mautrix-bluesky/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-bluesky.service.j2 | 2 +- .../matrix-bridge-mautrix-discord/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-discord.service.j2 | 2 +- .../matrix-bridge-mautrix-gmessages/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-gmessages.service.j2 | 2 +- .../matrix-bridge-mautrix-googlechat/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-googlechat.service.j2 | 2 +- .../matrix-bridge-mautrix-meta-instagram/tasks/install.yml | 2 +- .../templates/systemd/matrix-mautrix-meta.service.j2 | 2 +- .../matrix-bridge-mautrix-meta-messenger/tasks/install.yml | 2 +- .../templates/systemd/matrix-mautrix-meta.service.j2 | 2 +- .../matrix-bridge-mautrix-signal/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-signal.service.j2 | 2 +- .../matrix-bridge-mautrix-slack/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-slack.service.j2 | 2 +- .../matrix-bridge-mautrix-telegram/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-telegram.service.j2 | 2 +- .../matrix-bridge-mautrix-twitter/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-twitter.service.j2 | 2 +- .../matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mautrix-whatsapp.service.j2 | 2 +- .../matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml | 2 +- .../systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 | 2 +- .../templates/systemd/matrix-mautrix-wsproxy.service.j2 | 2 +- .../matrix-bridge-meshtastic-relay/tasks/setup_install.yml | 5 +++-- .../templates/systemd/matrix-meshtastic-relay.service.j2 | 2 +- .../matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mx-puppet-groupme.service.j2 | 2 +- .../matrix-bridge-mx-puppet-steam/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-mx-puppet-steam.service.j2 | 2 +- .../custom/matrix-bridge-postmoogle/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-postmoogle.service.j2 | 2 +- roles/custom/matrix-bridge-sms/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-sms-bridge.service.j2 | 2 +- roles/custom/matrix-bridge-steam/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-steam-bridge.service.j2 | 2 +- roles/custom/matrix-bridge-wechat/tasks/install.yml | 2 +- .../templates/systemd/matrix-wechat-agent.service.j2 | 2 +- .../templates/systemd/matrix-wechat.service.j2 | 2 +- roles/custom/matrix-cactus-comments-client/tasks/install.yml | 2 +- .../systemd/matrix-cactus-comments-client.service.j2 | 2 +- .../templates/systemd/matrix-cactus-comments.service.j2 | 2 +- roles/custom/matrix-client-commet/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-client-commet.service.j2 | 2 +- roles/custom/matrix-client-element/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-client-element.service.j2 | 2 +- .../custom/matrix-client-fluffychat/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-client-fluffychat.service.j2 | 2 +- .../custom/matrix-client-schildichat/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-client-schildichat.service.j2 | 2 +- roles/custom/matrix-conduit/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-conduit.service.j2 | 2 +- roles/custom/matrix-continuwuity/tasks/install.yml | 2 +- roles/custom/matrix-continuwuity/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-continuwuity.service.j2 | 2 +- roles/custom/matrix-corporal/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-corporal.service.j2 | 2 +- roles/custom/matrix-dendrite/tasks/setup_install.yml | 2 +- .../templates/systemd/matrix-dendrite.service.j2 | 2 +- roles/custom/matrix-element-admin/tasks/install.yml | 2 +- .../templates/systemd/matrix-element-admin.service.j2 | 2 +- roles/custom/matrix-element-call/tasks/install.yml | 2 +- .../templates/systemd/matrix-element-call.service.j2 | 2 +- roles/custom/matrix-ketesa/tasks/setup_install.yml | 2 +- .../matrix-ketesa/templates/systemd/matrix-ketesa.service.j2 | 2 +- roles/custom/matrix-livekit-jwt-service/tasks/install.yml | 2 +- .../templates/systemd/matrix-livekit-jwt-service.service.j2 | 2 +- roles/custom/matrix-matrixto/tasks/install.yml | 4 ++-- .../templates/systemd/matrix-matrixto.service.j2 | 2 +- roles/custom/matrix-media-repo/tasks/setup_install.yml | 2 +- .../media-repo/systemd/matrix-media-repo.service.j2 | 2 +- roles/custom/matrix-pantalaimon/tasks/install.yml | 2 +- .../templates/systemd/matrix-pantalaimon.service.j2 | 2 +- roles/custom/matrix-rageshake/tasks/install.yml | 2 +- .../templates/systemd/matrix-rageshake.service.j2 | 2 +- roles/custom/matrix-static-files/tasks/install.yml | 2 +- .../templates/systemd/matrix-static-files.service.j2 | 2 +- roles/custom/matrix-sygnal/tasks/install.yml | 2 +- .../matrix-sygnal/templates/systemd/matrix-sygnal.service.j2 | 2 +- .../custom/matrix-synapse-auto-compressor/tasks/install.yml | 2 +- .../templates/matrix-synapse-auto-compressor.service.j2 | 2 +- .../matrix-synapse-usage-exporter/tasks/setup_install.yml | 2 +- .../systemd/matrix-synapse-usage-exporter.service.j2 | 2 +- .../tasks/reverse_proxy_companion/setup_install.yml | 2 +- roles/custom/matrix-synapse/tasks/synapse/setup_install.yml | 2 +- .../matrix-synapse-reverse-proxy-companion.service.j2 | 2 +- .../synapse/systemd/matrix-synapse-worker.service.j2 | 2 +- .../templates/synapse/systemd/matrix-synapse.service.j2 | 2 +- roles/custom/matrix-tuwunel/tasks/install.yml | 2 +- .../templates/systemd/matrix-tuwunel.service.j2 | 2 +- .../matrix-user-verification-service/tasks/setup_install.yml | 2 +- .../systemd/matrix-user-verification-service.service.j2 | 2 +- 128 files changed, 131 insertions(+), 130 deletions(-) diff --git a/roles/custom/matrix-alertmanager-receiver/tasks/install.yml b/roles/custom/matrix-alertmanager-receiver/tasks/install.yml index 35476ee06..97572b53f 100644 --- a/roles/custom/matrix-alertmanager-receiver/tasks/install.yml +++ b/roles/custom/matrix-alertmanager-receiver/tasks/install.yml @@ -73,7 +73,7 @@ changed_when: true - name: Ensure matrix-alertmanager-receiver container network is created - when: matrix_alertmanager_receiver_container_network not in ['', 'host'] + when: matrix_alertmanager_receiver_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_alertmanager_receiver_container_network }}" diff --git a/roles/custom/matrix-alertmanager-receiver/templates/systemd/matrix-alertmanager-receiver.service.j2 b/roles/custom/matrix-alertmanager-receiver/templates/systemd/matrix-alertmanager-receiver.service.j2 index 08fb42448..07d7d31cd 100644 --- a/roles/custom/matrix-alertmanager-receiver/templates/systemd/matrix-alertmanager-receiver.service.j2 +++ b/roles/custom/matrix-alertmanager-receiver/templates/systemd/matrix-alertmanager-receiver.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --config-path=/config/config.yml {{ matrix_alertmanager_receiver_container_process_extra_arguments | join(' ') }} \ --log-level={{ matrix_alertmanager_receiver_container_process_argument_log_level }} -{% if matrix_alertmanager_receiver_container_network not in ['', 'host'] %} +{% if matrix_alertmanager_receiver_container_network != 'host' %} {% for network in matrix_alertmanager_receiver_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-alertmanager-receiver {% endfor %} diff --git a/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml b/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml index 0a150512d..b1b1d1dbf 100644 --- a/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml +++ b/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml @@ -88,7 +88,7 @@ register: matrix_appservice_draupnir_for_all_registration_config_result - name: Ensure matrix-appservice-draupnir-for-all container network is created - when: matrix_appservice_draupnir_for_all_container_network not in ['', 'host'] + when: matrix_appservice_draupnir_for_all_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_appservice_draupnir_for_all_container_network }}" diff --git a/roles/custom/matrix-appservice-draupnir-for-all/templates/systemd/matrix-appservice-draupnir-for-all.service.j2 b/roles/custom/matrix-appservice-draupnir-for-all/templates/systemd/matrix-appservice-draupnir-for-all.service.j2 index dcc9adc0a..8dc631ad8 100644 --- a/roles/custom/matrix-appservice-draupnir-for-all/templates/systemd/matrix-appservice-draupnir-for-all.service.j2 +++ b/roles/custom/matrix-appservice-draupnir-for-all/templates/systemd/matrix-appservice-draupnir-for-all.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_appservice_draupnir_for_all_container_image }} \ appservice -c /data/config/production-appservice.yaml -f /data/config/draupnir-for-all-registration.yaml -p {{ matrix_appservice_draupnir_for_all_appservice_port }} --draupnir-config /data/config/production-bots.yaml -{% if matrix_appservice_draupnir_for_all_container_network not in ['', 'host'] %} +{% if matrix_appservice_draupnir_for_all_container_network != 'host' %} {% for network in matrix_appservice_draupnir_for_all_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-draupnir-for-all {% endfor %} diff --git a/roles/custom/matrix-authentication-service/tasks/install.yml b/roles/custom/matrix-authentication-service/tasks/install.yml index 1575bd7f0..f13415f6a 100644 --- a/roles/custom/matrix-authentication-service/tasks/install.yml +++ b/roles/custom/matrix-authentication-service/tasks/install.yml @@ -114,7 +114,7 @@ changed_when: true - name: Ensure Matrix Authentication Service container network is created - when: matrix_authentication_service_container_network not in ['', 'host'] + when: matrix_authentication_service_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_authentication_service_container_network }}" diff --git a/roles/custom/matrix-authentication-service/templates/systemd/matrix-authentication-service.service.j2 b/roles/custom/matrix-authentication-service/templates/systemd/matrix-authentication-service.service.j2 index dd283d3a6..ceb353f22 100644 --- a/roles/custom/matrix-authentication-service/templates/systemd/matrix-authentication-service.service.j2 +++ b/roles/custom/matrix-authentication-service/templates/systemd/matrix-authentication-service.service.j2 @@ -36,7 +36,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_authentication_service_container_image }} -{% if matrix_authentication_service_container_network not in ['', 'host'] %} +{% if matrix_authentication_service_container_network != 'host' %} {% for network in matrix_authentication_service_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-authentication-service {% endfor %} diff --git a/roles/custom/matrix-bot-baibot/tasks/install.yml b/roles/custom/matrix-bot-baibot/tasks/install.yml index 98ec7163f..e31057943 100644 --- a/roles/custom/matrix-bot-baibot/tasks/install.yml +++ b/roles/custom/matrix-bot-baibot/tasks/install.yml @@ -69,7 +69,7 @@ register: matrix_bot_baibot_container_image_build_result - name: Ensure baibot container network is created - when: matrix_bot_baibot_container_network not in ['', 'host'] + when: matrix_bot_baibot_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_baibot_container_network }}" diff --git a/roles/custom/matrix-bot-baibot/templates/systemd/matrix-bot-baibot.service.j2 b/roles/custom/matrix-bot-baibot/templates/systemd/matrix-bot-baibot.service.j2 index c22272029..3483b086b 100644 --- a/roles/custom/matrix-bot-baibot/templates/systemd/matrix-bot-baibot.service.j2 +++ b/roles/custom/matrix-bot-baibot/templates/systemd/matrix-bot-baibot.service.j2 @@ -37,7 +37,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_bot_baibot_container_image }} -{% if matrix_bot_baibot_container_network not in ['', 'host'] %} +{% if matrix_bot_baibot_container_network != 'host' %} {% for network in matrix_bot_baibot_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-baibot {% endfor %} diff --git a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml index c127def45..e71713bfe 100644 --- a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml @@ -110,7 +110,7 @@ }} - name: Ensure Buscarron container network is created - when: matrix_bot_buscarron_container_network not in ['', 'host'] + when: matrix_bot_buscarron_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_buscarron_container_network }}" diff --git a/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 b/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 index 909487446..69c22f4c4 100644 --- a/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 +++ b/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_bot_buscarron_container_image }} -{% if matrix_bot_buscarron_container_network not in ['', 'host'] %} +{% if matrix_bot_buscarron_container_network != 'host' %} {% for network in matrix_bot_buscarron_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-buscarron {% endfor %} diff --git a/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml b/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml index 0c48d7e44..efe7bba24 100644 --- a/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml @@ -82,7 +82,7 @@ register: matrix_bot_draupnir_config_result - name: Ensure matrix-bot-draupnir container network is created - when: matrix_bot_draupnir_container_network not in ['', 'host'] + when: matrix_bot_draupnir_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_draupnir_container_network }}" diff --git a/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 b/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 index 3c0437c9f..75438e5b0 100644 --- a/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 +++ b/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 @@ -36,7 +36,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_bot_draupnir_container_image }} \ bot --draupnir-config /data/config/production.yaml -{% if matrix_bot_draupnir_container_network not in ['', 'host'] %} +{% if matrix_bot_draupnir_container_network != 'host' %} {% for network in matrix_bot_draupnir_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-draupnir {% endfor %} diff --git a/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml b/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml index d22ee9e7d..bd861d9b3 100644 --- a/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml @@ -94,7 +94,7 @@ register: matrix_bot_honoroit_container_image_build_result - name: Ensure Honoroit container network is created - when: matrix_bot_honoroit_container_network not in ['', 'host'] + when: matrix_bot_honoroit_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_honoroit_container_network }}" diff --git a/roles/custom/matrix-bot-honoroit/templates/systemd/matrix-bot-honoroit.service.j2 b/roles/custom/matrix-bot-honoroit/templates/systemd/matrix-bot-honoroit.service.j2 index 769185af3..dd802eb6b 100644 --- a/roles/custom/matrix-bot-honoroit/templates/systemd/matrix-bot-honoroit.service.j2 +++ b/roles/custom/matrix-bot-honoroit/templates/systemd/matrix-bot-honoroit.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_bot_honoroit_container_image }} -{% if matrix_bot_honoroit_container_network not in ['', 'host'] %} +{% if matrix_bot_honoroit_container_network != 'host' %} {% for network in matrix_bot_honoroit_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-honoroit {% endfor %} diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml index caa2c0437..edc2a0dad 100644 --- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml @@ -62,7 +62,7 @@ register: matrix_bot_matrix_registration_bot_container_image_build_result - name: Ensure matrix-registration-bot container network is created - when: matrix_bot_matrix_registration_bot_container_network not in ['', 'host'] + when: matrix_bot_matrix_registration_bot_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_matrix_registration_bot_container_network }}" diff --git a/roles/custom/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 b/roles/custom/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 index abf46f125..623cff3d1 100644 --- a/roles/custom/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 +++ b/roles/custom/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 @@ -29,7 +29,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --network={{ matrix_bot_matrix_registration_bot_container_network }} \ {{ matrix_bot_matrix_registration_bot_container_image }} -{% if matrix_bot_matrix_registration_bot_container_network not in ['', 'host'] %} +{% if matrix_bot_matrix_registration_bot_container_network != 'host' %} {% for network in matrix_bot_matrix_registration_bot_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-matrix-registration-bot {% endfor %} diff --git a/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml index fc8e93988..1c2c0af65 100644 --- a/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml @@ -93,7 +93,7 @@ register: matrix_bot_matrix_reminder_bot_config_result - name: Ensure matrix-reminder-bot container network is created - when: matrix_bot_matrix_reminder_bot_container_network not in ['', 'host'] + when: matrix_bot_matrix_reminder_bot_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_matrix_reminder_bot_container_network }}" diff --git a/roles/custom/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2 b/roles/custom/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2 index f79f22262..263ca1131 100644 --- a/roles/custom/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2 +++ b/roles/custom/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_bot_matrix_reminder_bot_container_image }} \ -c "matrix-reminder-bot /config/config.yaml" -{% if matrix_bot_matrix_reminder_bot_container_network not in ['', 'host'] %} +{% if matrix_bot_matrix_reminder_bot_container_network != 'host' %} {% for network in matrix_bot_matrix_reminder_bot_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-matrix-reminder-bot {% endfor %} diff --git a/roles/custom/matrix-bot-maubot/tasks/setup_install.yml b/roles/custom/matrix-bot-maubot/tasks/setup_install.yml index a1677f563..3ae13bc59 100644 --- a/roles/custom/matrix-bot-maubot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-maubot/tasks/setup_install.yml @@ -98,7 +98,7 @@ register: matrix_bot_maubot_support_files_result - name: Ensure maubot container network is created - when: matrix_bot_maubot_container_network not in ['', 'host'] + when: matrix_bot_maubot_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_bot_maubot_container_network }}" diff --git a/roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 b/roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 index 0e1489fb2..6e0206f8f 100644 --- a/roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 +++ b/roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 @@ -41,7 +41,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_bot_maubot_container_image_final }} \ python3 -m maubot -c /config/config.yaml --no-update -{% if matrix_bot_maubot_container_network not in ['', 'host'] %} +{% if matrix_bot_maubot_container_network != 'host' %} {% for network in matrix_bot_maubot_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-maubot {% endfor %} diff --git a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml index b0e18c365..92e8bd4d7 100644 --- a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml @@ -68,7 +68,7 @@ register: matrix_bot_mjolnir_config_result - name: Ensure matrix-bot-mjolnir container network is created - when: matrix_bot_mjolnir_container_network not in ['', 'host'] + 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 }}" diff --git a/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 b/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 index 9d6d71801..840264c7e 100644 --- a/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 +++ b/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_bot_mjolnir_container_image }} \ bot --mjolnir-config /data/config/production.yaml -{% if matrix_bot_mjolnir_container_network not in ['', 'host'] %} +{% if matrix_bot_mjolnir_container_network != 'host' %} {% for network in matrix_bot_mjolnir_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-mjolnir {% endfor %} diff --git a/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml index 5feb31b46..6a64c0a8a 100644 --- a/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml @@ -118,7 +118,7 @@ changed_when: false - name: Ensure matrix-appservice-discord container network is created - when: matrix_appservice_discord_container_network not in ['', 'host'] + when: matrix_appservice_discord_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_appservice_discord_container_network }}" diff --git a/roles/custom/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2 b/roles/custom/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2 index 3358749d4..54c66065a 100644 --- a/roles/custom/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2 +++ b/roles/custom/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_appservice_discord_container_image }} \ node /build/src/discordas.js -p 9005 -c /cfg/config.yaml -f /cfg/registration.yaml -{% if matrix_appservice_discord_container_network not in ['', 'host'] %} +{% if matrix_appservice_discord_container_network != 'host' %} {% for network in matrix_appservice_discord_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-discord {% endfor %} diff --git a/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml index 3ab541201..fc7d148f0 100644 --- a/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml @@ -245,7 +245,7 @@ register: matrix_appservice_irc_registration_result - name: Ensure matrix-appservice-irc container network is created - when: matrix_appservice_irc_container_network not in ['', 'host'] + when: matrix_appservice_irc_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_appservice_irc_container_network }}" diff --git a/roles/custom/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2 b/roles/custom/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2 index 75bb23fc6..82998c5f2 100644 --- a/roles/custom/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2 +++ b/roles/custom/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2 @@ -39,7 +39,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_appservice_irc_container_image }} \ -c 'node app.js -c /config/config.yaml -f /config/registration.yaml -p 9999' -{% if matrix_appservice_irc_container_network not in ['', 'host'] %} +{% if matrix_appservice_irc_container_network != 'host' %} {% for network in matrix_appservice_irc_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-irc {% endfor %} diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml index 542dc25b0..e5fcdbb7d 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml @@ -99,7 +99,7 @@ register: matrix_appservice_kakaotalk_registration_result - name: Ensure matrix-appservice-kakaotalk container network is created - when: matrix_appservice_kakaotalk_container_network not in ['', 'host'] + when: matrix_appservice_kakaotalk_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_appservice_kakaotalk_container_network }}" diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk-node.service.j2 b/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk-node.service.j2 index b870efedf..2ddfe50a1 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk-node.service.j2 +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk-node.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_appservice_kakaotalk_node_container_image }} \ node src/main.js --config /config.json -{% if matrix_appservice_kakaotalk_container_network not in ['', 'host'] %} +{% if matrix_appservice_kakaotalk_container_network != 'host' %} {% for network in matrix_appservice_kakaotalk_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-kakaotalk-node {% endfor %} diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk.service.j2 b/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk.service.j2 index f53f261a2..dd85536df 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk.service.j2 +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/templates/systemd/matrix-appservice-kakaotalk.service.j2 @@ -31,7 +31,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_appservice_kakaotalk_container_image }} \ python3 -m matrix_appservice_kakaotalk -c /config/config.yaml --no-update -{% if matrix_appservice_discord_container_network not in ['', 'host'] %} +{% if matrix_appservice_discord_container_network != 'host' %} {% for network in matrix_appservice_discord_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-kakaotalk {% endfor %} diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml index 19b28671a..19cf6f27b 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml @@ -92,7 +92,7 @@ register: matrix_beeper_linkedin_container_image_build_result - name: Ensure beeper-linkedin container network is created - when: matrix_beeper_linkedin_container_network not in ['', 'host'] + when: matrix_beeper_linkedin_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_beeper_linkedin_container_network }}" diff --git a/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 b/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 index 8d41265c0..65f796a80 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 +++ b/roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 @@ -31,7 +31,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_beeper_linkedin_container_image }} \ python3 -m linkedin_matrix -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_beeper_linkedin_container_network not in ['', 'host'] %} +{% if matrix_beeper_linkedin_container_network != 'host' %} {% for network in matrix_beeper_linkedin_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-beeper-linkedin {% endfor %} diff --git a/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml b/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml index 09b150432..9241bfaa0 100644 --- a/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml @@ -50,7 +50,7 @@ register: matrix_heisenbridge_support_files_result - name: Ensure Heisenbridge container network is created - when: matrix_heisenbridge_container_network not in ['', 'host'] + when: matrix_heisenbridge_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_heisenbridge_container_network }}" diff --git a/roles/custom/matrix-bridge-heisenbridge/templates/systemd/matrix-heisenbridge.service.j2 b/roles/custom/matrix-bridge-heisenbridge/templates/systemd/matrix-heisenbridge.service.j2 index 6ce5a6bac..64c9f6231 100644 --- a/roles/custom/matrix-bridge-heisenbridge/templates/systemd/matrix-heisenbridge.service.j2 +++ b/roles/custom/matrix-bridge-heisenbridge/templates/systemd/matrix-heisenbridge.service.j2 @@ -44,7 +44,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --listen-port 9898 \ {{ matrix_heisenbridge_homeserver_url }} -{% if matrix_heisenbridge_container_network not in ['', 'host'] %} +{% if matrix_heisenbridge_container_network != 'host' %} {% for network in matrix_heisenbridge_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-heisenbridge {% endfor %} diff --git a/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml b/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml index 330924b4b..2c86faed0 100644 --- a/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml @@ -133,7 +133,7 @@ register: matrix_hookshot_github_key_result - name: Ensure matrix-hookshot container network is created - when: matrix_hookshot_container_network not in ['', 'host'] + when: matrix_hookshot_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_hookshot_container_network }}" diff --git a/roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2 b/roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2 index d2df403ba..983be0a54 100644 --- a/roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2 +++ b/roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm - {% endfor %} {{ matrix_hookshot_container_image }} -{% if matrix_hookshot_container_network not in ['', 'host'] %} +{% if matrix_hookshot_container_network != 'host' %} {% for network in matrix_hookshot_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_hookshot_identifier }} {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml index 244fdb453..70f991728 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml @@ -82,7 +82,7 @@ register: matrix_mautrix_bluesky_support_files_result - name: Ensure matrix-mautrix-bluesky container network is created - when: matrix_mautrix_bluesky_container_network not in ['', 'host'] + when: matrix_mautrix_bluesky_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_bluesky_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 b/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 index 275cdedf7..22117f643 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-bluesky/templates/systemd/matrix-mautrix-bluesky.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_bluesky_container_image }} \ /usr/bin/mautrix-bluesky -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_bluesky_container_network not in ['', 'host'] %} +{% if matrix_mautrix_bluesky_container_network != 'host' %} {% for network in matrix_mautrix_bluesky_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-bluesky {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml index 6924e3aa5..8136d846c 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml @@ -110,7 +110,7 @@ register: matrix_mautrix_discord_support_files_result - name: Ensure mautrix-discord container network is created - when: matrix_mautrix_discord_container_network not in ['', 'host'] + when: matrix_mautrix_discord_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_discord_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 b/roles/custom/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 index 3e05d518c..e603c1bbf 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_discord_container_image }} \ /usr/bin/mautrix-discord -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_discord_container_network not in ['', 'host'] %} +{% if matrix_mautrix_discord_container_network != 'host' %} {% for network in matrix_mautrix_discord_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-discord {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml index b9c6b16b6..02eda18d0 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml @@ -150,7 +150,7 @@ register: matrix_mautrix_gmessages_support_files_result - name: Ensure matrix-mautrix-gmessages container network is created - when: matrix_mautrix_gmessages_container_network not in ['', 'host'] + when: matrix_mautrix_gmessages_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_gmessages_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/templates/systemd/matrix-mautrix-gmessages.service.j2 b/roles/custom/matrix-bridge-mautrix-gmessages/templates/systemd/matrix-mautrix-gmessages.service.j2 index e79407ea5..9e6b4e82a 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/templates/systemd/matrix-mautrix-gmessages.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-gmessages/templates/systemd/matrix-mautrix-gmessages.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_gmessages_container_image }} \ /usr/bin/mautrix-gmessages -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_gmessages_container_network not in ['', 'host'] %} +{% if matrix_mautrix_gmessages_container_network != 'host' %} {% for network in matrix_mautrix_gmessages_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-gmessages {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml index 48f444b40..6ba44f709 100644 --- a/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml @@ -133,7 +133,7 @@ register: matrix_mautrix_googlechat_support_files_result - name: Ensure matrix-mautrix-googlechat container network is created - when: matrix_mautrix_googlechat_container_network not in ['', 'host'] + when: matrix_mautrix_googlechat_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_googlechat_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-googlechat/templates/systemd/matrix-mautrix-googlechat.service.j2 b/roles/custom/matrix-bridge-mautrix-googlechat/templates/systemd/matrix-mautrix-googlechat.service.j2 index a4c865611..d616433bb 100644 --- a/roles/custom/matrix-bridge-mautrix-googlechat/templates/systemd/matrix-mautrix-googlechat.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-googlechat/templates/systemd/matrix-mautrix-googlechat.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_googlechat_container_image }} \ python3 -m mautrix_googlechat -c /config/config.yaml --no-update -{% if matrix_mautrix_googlechat_container_network not in ['', 'host'] %} +{% if matrix_mautrix_googlechat_container_network != 'host' %} {% for network in matrix_mautrix_googlechat_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-googlechat {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml index 7e8e44701..2ef0c9359 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml @@ -107,7 +107,7 @@ register: matrix_mautrix_meta_instagram_support_files_result - name: Ensure mautrix-meta-instagram container network is created - when: matrix_mautrix_meta_instagram_container_network not in ['', 'host'] + when: matrix_mautrix_meta_instagram_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_meta_instagram_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/systemd/matrix-mautrix-meta.service.j2 b/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/systemd/matrix-mautrix-meta.service.j2 index a8f905b31..5cecc659c 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/systemd/matrix-mautrix-meta.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/templates/systemd/matrix-mautrix-meta.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_meta_instagram_container_image }} \ /usr/bin/mautrix-meta -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_meta_instagram_container_network not in ['', 'host'] %} +{% if matrix_mautrix_meta_instagram_container_network != 'host' %} {% for network in matrix_mautrix_meta_instagram_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_mautrix_meta_instagram_identifier }} {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml index 477ddbc24..b4b1e8f14 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml @@ -107,7 +107,7 @@ register: matrix_mautrix_meta_messenger_support_files_result - name: Ensure mautrix-meta-messenger container network is created - when: matrix_mautrix_meta_messenger_container_network not in ['', 'host'] + when: matrix_mautrix_meta_messenger_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_meta_messenger_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/systemd/matrix-mautrix-meta.service.j2 b/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/systemd/matrix-mautrix-meta.service.j2 index 6534fd460..7d5bbbdef 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/systemd/matrix-mautrix-meta.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/templates/systemd/matrix-mautrix-meta.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_meta_messenger_container_image }} \ /usr/bin/mautrix-meta -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_meta_messenger_container_network not in ['', 'host'] %} +{% if matrix_mautrix_meta_messenger_container_network != 'host' %} {% for network in matrix_mautrix_meta_messenger_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_mautrix_meta_messenger_identifier }} {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml index e05a64a69..5d549bd1e 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml @@ -148,7 +148,7 @@ register: matrix_mautrix_signal_support_files_result - name: Ensure matrix-mautrix-signal container network is created - when: matrix_mautrix_signal_container_network not in ['', 'host'] + when: matrix_mautrix_signal_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_signal_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-signal/templates/systemd/matrix-mautrix-signal.service.j2 b/roles/custom/matrix-bridge-mautrix-signal/templates/systemd/matrix-mautrix-signal.service.j2 index 92c2670d3..4587ad170 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/templates/systemd/matrix-mautrix-signal.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-signal/templates/systemd/matrix-mautrix-signal.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_signal_container_image }} \ /usr/bin/mautrix-signal -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_signal_container_network not in ['', 'host'] %} +{% if matrix_mautrix_signal_container_network != 'host' %} {% for network in matrix_mautrix_signal_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-signal {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml index 9d073e20e..f6e5a4bc9 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml @@ -98,7 +98,7 @@ register: matrix_mautrix_slack_registration_result - name: Ensure matrix-mautrix-slack container network is created - when: matrix_mautrix_slack_container_network not in ['', 'host'] + when: matrix_mautrix_slack_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_slack_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-slack/templates/systemd/matrix-mautrix-slack.service.j2 b/roles/custom/matrix-bridge-mautrix-slack/templates/systemd/matrix-mautrix-slack.service.j2 index 3f7d61c35..9b5231480 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/templates/systemd/matrix-mautrix-slack.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-slack/templates/systemd/matrix-mautrix-slack.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_slack_container_image }} \ /usr/bin/mautrix-slack -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_slack_container_network not in ['', 'host'] %} +{% if matrix_mautrix_slack_container_network != 'host' %} {% for network in matrix_mautrix_slack_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-slack {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml index 54e5be683..19722a59d 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml @@ -154,7 +154,7 @@ register: matrix_mautrix_telegram_support_files_result - name: Ensure matrix-mautrix-telegram container network is created - when: matrix_mautrix_telegram_container_network not in ['', 'host'] + when: matrix_mautrix_telegram_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_telegram_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 b/roles/custom/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 index e386ccd66..978d2db69 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_telegram_container_image }} \ /usr/bin/mautrix-telegram -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_telegram_container_network not in ['', 'host'] %} +{% if matrix_mautrix_telegram_container_network != 'host' %} {% for network in matrix_mautrix_telegram_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-telegram {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml index c248266e7..8db0b6834 100644 --- a/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml @@ -88,7 +88,7 @@ register: matrix_mautrix_twitter_support_files_result - name: Ensure matrix-mautrix-twitter container network is created - when: matrix_mautrix_twitter_container_network not in ['', 'host'] + when: matrix_mautrix_twitter_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_twitter_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-twitter/templates/systemd/matrix-mautrix-twitter.service.j2 b/roles/custom/matrix-bridge-mautrix-twitter/templates/systemd/matrix-mautrix-twitter.service.j2 index 45ffcebc2..bb61402c6 100644 --- a/roles/custom/matrix-bridge-mautrix-twitter/templates/systemd/matrix-mautrix-twitter.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-twitter/templates/systemd/matrix-mautrix-twitter.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_twitter_container_image }} \ /usr/bin/mautrix-twitter -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_twitter_container_network not in ['', 'host'] %} +{% if matrix_mautrix_twitter_container_network != 'host' %} {% for network in matrix_mautrix_twitter_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-twitter {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml index 4b26a81eb..fd39ddfd7 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml @@ -153,7 +153,7 @@ register: matrix_mautrix_whatsapp_support_files_result - name: Ensure matrix-mautrix-whatsapp container network is created - when: matrix_mautrix_whatsapp_container_network not in ['', 'host'] + when: matrix_mautrix_whatsapp_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_whatsapp_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2 b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2 index c3c2ce718..cd1924c81 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_mautrix_whatsapp_container_image }} \ /usr/bin/mautrix-whatsapp -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_mautrix_whatsapp_container_network not in ['', 'host'] %} +{% if matrix_mautrix_whatsapp_container_network != 'host' %} {% for network in matrix_mautrix_whatsapp_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-whatsapp {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml index d02f1843b..94e61a3b7 100644 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml @@ -107,7 +107,7 @@ register: matrix_mautrix_wsproxy_registration_imessage_result - name: Ensure mautrix-wsproxy container network is created - when: matrix_mautrix_wsproxy_container_network not in ['', 'host'] + when: matrix_mautrix_wsproxy_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mautrix_wsproxy_container_network }}" diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 index e21317070..54673bd9b 100644 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 @@ -29,7 +29,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_mautrix_wsproxy_syncproxy_container_image }} -{% if matrix_mautrix_wsproxy_container_network not in ['', 'host'] %} +{% if matrix_mautrix_wsproxy_container_network != 'host' %} {% for network in matrix_mautrix_wsproxy_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-wsproxy-syncproxy {% endfor %} diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2 b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2 index d741e16cd..fb5707414 100644 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2 +++ b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm - {{ matrix_mautrix_wsproxy_container_image }} \ /usr/bin/mautrix-wsproxy -config /data/config.yaml -{% if matrix_mautrix_wsproxy_container_network not in ['', 'host'] %} +{% if matrix_mautrix_wsproxy_container_network != 'host' %} {% for network in matrix_mautrix_wsproxy_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-wsproxy {% endfor %} diff --git a/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml b/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml index 2ef6b281b..0237dd305 100644 --- a/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml @@ -36,13 +36,14 @@ register: matrix_meshtastic_relay_config_result - name: Ensure matrix-meshtastic-relay container network is created - when: matrix_meshtastic_relay_container_network not in ['', 'host'] + 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 }}" - when: "matrix_meshtastic_relay_connection_type != 'ble'" - name: Ensure matrix-meshtastic-relay.service installed ansible.builtin.template: diff --git a/roles/custom/matrix-bridge-meshtastic-relay/templates/systemd/matrix-meshtastic-relay.service.j2 b/roles/custom/matrix-bridge-meshtastic-relay/templates/systemd/matrix-meshtastic-relay.service.j2 index f180b6e7a..739e72c2f 100644 --- a/roles/custom/matrix-bridge-meshtastic-relay/templates/systemd/matrix-meshtastic-relay.service.j2 +++ b/roles/custom/matrix-bridge-meshtastic-relay/templates/systemd/matrix-meshtastic-relay.service.j2 @@ -43,7 +43,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_meshtastic_relay_container_image }} \ mmrelay --config /config/config.yaml -{% if matrix_meshtastic_relay_container_network not in ['', 'host'] %} +{% if matrix_meshtastic_relay_container_network != 'host' %} {% for network in matrix_meshtastic_relay_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-meshtastic-relay {% endfor %} diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml index 2a8595445..e360cb8bf 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml @@ -122,7 +122,7 @@ register: matrix_mx_puppet_groupme_registration_result - name: Ensure mx-puppet-groupme container network is created - when: matrix_mx_puppet_groupme_container_network not in ['', 'host'] + when: matrix_mx_puppet_groupme_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mx_puppet_groupme_container_network }}" diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2 b/roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2 index 5d7776a0c..c1cdc74a4 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_mx_puppet_groupme_container_image }} -{% if matrix_mx_puppet_groupme_container_network not in ['', 'host'] %} +{% if matrix_mx_puppet_groupme_container_network != 'host' %} {% for network in matrix_mx_puppet_groupme_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-groupme {% endfor %} diff --git a/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml index d85683738..36e829b64 100644 --- a/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml @@ -124,7 +124,7 @@ register: matrix_mx_puppet_steam_registration_result - name: Ensure mx-puppet-steam container network is created - when: matrix_mx_puppet_steam_container_network not in ['', 'host'] + when: matrix_mx_puppet_steam_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_mx_puppet_steam_container_network }}" diff --git a/roles/custom/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2 b/roles/custom/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2 index 8644507ac..49e374492 100644 --- a/roles/custom/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_mx_puppet_steam_container_image }} -{% if matrix_mx_puppet_steam_container_network not in ['', 'host'] %} +{% if matrix_mx_puppet_steam_container_network != 'host' %} {% for network in matrix_mx_puppet_steam_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-steam {% endfor %} diff --git a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml index 0cc8f49d0..1dcdeb91d 100644 --- a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml @@ -110,7 +110,7 @@ register: matrix_postmoogle_container_image_build_result - name: Ensure postmoogle container network is created - when: matrix_postmoogle_container_network not in ['', 'host'] + when: matrix_postmoogle_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_postmoogle_container_network }}" diff --git a/roles/custom/matrix-bridge-postmoogle/templates/systemd/matrix-postmoogle.service.j2 b/roles/custom/matrix-bridge-postmoogle/templates/systemd/matrix-postmoogle.service.j2 index eb5e1099d..80ebb5608 100644 --- a/roles/custom/matrix-bridge-postmoogle/templates/systemd/matrix-postmoogle.service.j2 +++ b/roles/custom/matrix-bridge-postmoogle/templates/systemd/matrix-postmoogle.service.j2 @@ -38,7 +38,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_postmoogle_container_image }} -{% if matrix_postmoogle_container_network not in ['', 'host'] %} +{% if matrix_postmoogle_container_network != 'host' %} {% for network in matrix_postmoogle_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-postmoogle {% endfor %} diff --git a/roles/custom/matrix-bridge-sms/tasks/setup_install.yml b/roles/custom/matrix-bridge-sms/tasks/setup_install.yml index 2ee7e06fb..b3470466b 100644 --- a/roles/custom/matrix-bridge-sms/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-sms/tasks/setup_install.yml @@ -60,7 +60,7 @@ register: matrix_sms_bridge_cert_result - name: Ensure matrix-sms-bridge container network is created - when: matrix_sms_bridge_container_network not in ['', 'host'] + when: matrix_sms_bridge_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_sms_bridge_container_network }}" diff --git a/roles/custom/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2 b/roles/custom/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2 index b07318065..69f2017c8 100644 --- a/roles/custom/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2 +++ b/roles/custom/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_sms_bridge_container_image }} -{% if matrix_sms_bridge_container_network not in ['', 'host'] %} +{% if matrix_sms_bridge_container_network != 'host' %} {% for network in matrix_sms_bridge_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-sms-bridge {% endfor %} diff --git a/roles/custom/matrix-bridge-steam/tasks/setup_install.yml b/roles/custom/matrix-bridge-steam/tasks/setup_install.yml index 1e2e5e8bb..a4312e442 100644 --- a/roles/custom/matrix-bridge-steam/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-steam/tasks/setup_install.yml @@ -82,7 +82,7 @@ register: matrix_steam_bridge_support_files_result - name: Ensure matrix-steam-bridge container network is created - when: matrix_steam_bridge_container_network not in ['', 'host'] + when: matrix_steam_bridge_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_steam_bridge_container_network }}" diff --git a/roles/custom/matrix-bridge-steam/templates/systemd/matrix-steam-bridge.service.j2 b/roles/custom/matrix-bridge-steam/templates/systemd/matrix-steam-bridge.service.j2 index 4bf6d81f6..b711101ce 100644 --- a/roles/custom/matrix-bridge-steam/templates/systemd/matrix-steam-bridge.service.j2 +++ b/roles/custom/matrix-bridge-steam/templates/systemd/matrix-steam-bridge.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_steam_bridge_container_image }} \ /usr/bin/steam -c /app/config/config.yaml -r /app/config/registration.yaml --no-update -{% if matrix_steam_bridge_container_network not in ['', 'host'] %} +{% if matrix_steam_bridge_container_network != 'host' %} {% for network in matrix_steam_bridge_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-steam-bridge {% endfor %} diff --git a/roles/custom/matrix-bridge-wechat/tasks/install.yml b/roles/custom/matrix-bridge-wechat/tasks/install.yml index 0378cd788..8ef3ae136 100644 --- a/roles/custom/matrix-bridge-wechat/tasks/install.yml +++ b/roles/custom/matrix-bridge-wechat/tasks/install.yml @@ -110,7 +110,7 @@ register: matrix_wechat_agent_config_result - name: Ensure matrix-wechat container network is created - when: matrix_wechat_container_network not in ['', 'host'] + when: matrix_wechat_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_wechat_container_network }}" diff --git a/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat-agent.service.j2 b/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat-agent.service.j2 index 7873bf44c..4d51bdcec 100644 --- a/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat-agent.service.j2 +++ b/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat-agent.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_wechat_agent_container_image }} -{% if matrix_wechat_container_network not in ['', 'host'] %} +{% if matrix_wechat_container_network != 'host' %} {% for network in matrix_wechat_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-wechat-agent {% endfor %} diff --git a/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat.service.j2 b/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat.service.j2 index b52c5315b..d3e6b972d 100644 --- a/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat.service.j2 +++ b/roles/custom/matrix-bridge-wechat/templates/systemd/matrix-wechat.service.j2 @@ -31,7 +31,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_wechat_container_image }} \ /usr/bin/matrix-wechat -c /config/config.yaml -r /config/registration.yaml --no-update -{% if matrix_wechat_container_network not in ['', 'host'] %} +{% if matrix_wechat_container_network != 'host' %} {% for network in matrix_wechat_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-wechat {% endfor %} diff --git a/roles/custom/matrix-cactus-comments-client/tasks/install.yml b/roles/custom/matrix-cactus-comments-client/tasks/install.yml index de45f418e..f7caca0cc 100644 --- a/roles/custom/matrix-cactus-comments-client/tasks/install.yml +++ b/roles/custom/matrix-cactus-comments-client/tasks/install.yml @@ -76,7 +76,7 @@ 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 not in ['', 'host'] + 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 }}" diff --git a/roles/custom/matrix-cactus-comments-client/templates/systemd/matrix-cactus-comments-client.service.j2 b/roles/custom/matrix-cactus-comments-client/templates/systemd/matrix-cactus-comments-client.service.j2 index 2f30e25a6..bb7601042 100755 --- a/roles/custom/matrix-cactus-comments-client/templates/systemd/matrix-cactus-comments-client.service.j2 +++ b/roles/custom/matrix-cactus-comments-client/templates/systemd/matrix-cactus-comments-client.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --mount type=bind,src={{ matrix_cactus_comments_client_public_path }},dst=/var/public,ro \ {{ matrix_cactus_comments_client_container_image }} -{% if matrix_cactus_comments_client_container_network not in ['', 'host'] %} +{% if matrix_cactus_comments_client_container_network != 'host' %} {% for network in matrix_cactus_comments_client_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-cactus-comments-client {% endfor %} diff --git a/roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2 b/roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2 index ea8d29100..5db5accc9 100644 --- a/roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2 +++ b/roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2 @@ -28,7 +28,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --network={{ matrix_cactus_comments_container_network }} \ {{ matrix_cactus_comments_container_image }} -{% if matrix_cactus_comments_container_network not in ['', 'host'] %} +{% if matrix_cactus_comments_container_network != 'host' %} {% for network in matrix_cactus_comments_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-cactus-comments {% endfor %} diff --git a/roles/custom/matrix-client-commet/tasks/setup_install.yml b/roles/custom/matrix-client-commet/tasks/setup_install.yml index c6c3e9cd2..0eec9001a 100644 --- a/roles/custom/matrix-client-commet/tasks/setup_install.yml +++ b/roles/custom/matrix-client-commet/tasks/setup_install.yml @@ -89,7 +89,7 @@ register: matrix_client_commet_support_files_result - name: Ensure Commet container network is created - when: matrix_client_commet_container_network not in ['', 'host'] + when: matrix_client_commet_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_client_commet_container_network }}" diff --git a/roles/custom/matrix-client-commet/templates/systemd/matrix-client-commet.service.j2 b/roles/custom/matrix-client-commet/templates/systemd/matrix-client-commet.service.j2 index 5cc568841..afd4a4310 100644 --- a/roles/custom/matrix-client-commet/templates/systemd/matrix-client-commet.service.j2 +++ b/roles/custom/matrix-client-commet/templates/systemd/matrix-client-commet.service.j2 @@ -41,7 +41,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_client_commet_container_image }} -{% if matrix_client_commet_container_network not in ['', 'host'] %} +{% if matrix_client_commet_container_network != 'host' %} {% for network in matrix_client_commet_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-commet {% endfor %} diff --git a/roles/custom/matrix-client-element/tasks/setup_install.yml b/roles/custom/matrix-client-element/tasks/setup_install.yml index 2ca7124eb..7ffd753fd 100644 --- a/roles/custom/matrix-client-element/tasks/setup_install.yml +++ b/roles/custom/matrix-client-element/tasks/setup_install.yml @@ -116,7 +116,7 @@ when: "item.src is none" - name: Ensure Element Web container network is created - when: matrix_client_element_container_network not in ['', 'host'] + when: matrix_client_element_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_client_element_container_network }}" diff --git a/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 b/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 index 96614cdc8..063d3b624 100644 --- a/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 +++ b/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 @@ -52,7 +52,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_client_element_container_image }} -{% if matrix_client_element_container_network not in ['', 'host'] %} +{% if matrix_client_element_container_network != 'host' %} {% for network in matrix_client_element_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-element {% endfor %} diff --git a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml index 225d9e5f4..44791239f 100644 --- a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml +++ b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml @@ -62,7 +62,7 @@ register: matrix_client_fluffychat_config_result - name: Ensure FluffyChat Web container network is created - when: matrix_client_fluffychat_container_network not in ['', 'host'] + when: matrix_client_fluffychat_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_client_fluffychat_container_network }}" diff --git a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 index 58491e324..f5ee16627 100644 --- a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 +++ b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 @@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_client_fluffychat_container_image }} -{% if matrix_client_fluffychat_container_network not in ['', 'host'] %} +{% if matrix_client_fluffychat_container_network != 'host' %} {% for network in matrix_client_fluffychat_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-fluffychat {% endfor %} diff --git a/roles/custom/matrix-client-schildichat/tasks/setup_install.yml b/roles/custom/matrix-client-schildichat/tasks/setup_install.yml index e10e9cc94..d6de88274 100644 --- a/roles/custom/matrix-client-schildichat/tasks/setup_install.yml +++ b/roles/custom/matrix-client-schildichat/tasks/setup_install.yml @@ -107,7 +107,7 @@ when: "item.src is none" - name: Ensure SchildiChat Web container network is created - when: matrix_client_schildichat_container_network not in ['', 'host'] + when: matrix_client_schildichat_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_client_schildichat_container_network }}" diff --git a/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 b/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 index fee093014..fdfefa8a4 100644 --- a/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 +++ b/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 @@ -40,7 +40,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_client_schildichat_container_image }} -{% if matrix_client_schildichat_container_network not in ['', 'host'] %} +{% if matrix_client_schildichat_container_network != 'host' %} {% for network in matrix_client_schildichat_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-schildichat {% endfor %} diff --git a/roles/custom/matrix-conduit/tasks/setup_install.yml b/roles/custom/matrix-conduit/tasks/setup_install.yml index ce146740b..c204fbe59 100644 --- a/roles/custom/matrix-conduit/tasks/setup_install.yml +++ b/roles/custom/matrix-conduit/tasks/setup_install.yml @@ -45,7 +45,7 @@ register: matrix_conduit_support_files_result - name: Ensure Conduit container network is created - when: matrix_conduit_container_network not in ['', 'host'] + when: matrix_conduit_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_conduit_container_network }}" diff --git a/roles/custom/matrix-conduit/templates/systemd/matrix-conduit.service.j2 b/roles/custom/matrix-conduit/templates/systemd/matrix-conduit.service.j2 index 1565e3381..a8b76d610 100644 --- a/roles/custom/matrix-conduit/templates/systemd/matrix-conduit.service.j2 +++ b/roles/custom/matrix-conduit/templates/systemd/matrix-conduit.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_conduit_container_image }} -{% if matrix_conduit_container_network not in ['', 'host'] %} +{% if matrix_conduit_container_network != 'host' %} {% for network in matrix_conduit_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-conduit {% endfor %} diff --git a/roles/custom/matrix-continuwuity/tasks/install.yml b/roles/custom/matrix-continuwuity/tasks/install.yml index 542340c4b..8d5d6f04c 100644 --- a/roles/custom/matrix-continuwuity/tasks/install.yml +++ b/roles/custom/matrix-continuwuity/tasks/install.yml @@ -42,7 +42,7 @@ register: matrix_continuwuity_support_files_result - name: Ensure continuwuity container network is created - when: matrix_continuwuity_container_network not in ['', 'host'] + when: matrix_continuwuity_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_continuwuity_container_network }}" diff --git a/roles/custom/matrix-continuwuity/tasks/setup_install.yml b/roles/custom/matrix-continuwuity/tasks/setup_install.yml index bef902b0f..539ab5ce1 100644 --- a/roles/custom/matrix-continuwuity/tasks/setup_install.yml +++ b/roles/custom/matrix-continuwuity/tasks/setup_install.yml @@ -39,7 +39,7 @@ - labels - name: Ensure continuwuity container network is created - when: matrix_continuwuity_container_network not in ['', 'host'] + when: matrix_continuwuity_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_continuwuity_container_network }}" diff --git a/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 b/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 index 98acef127..da53c33be 100644 --- a/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 +++ b/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_continuwuity_container_image }} -{% if matrix_continuwuity_container_network not in ['', 'host'] %} +{% if matrix_continuwuity_container_network != 'host' %} {% for network in matrix_continuwuity_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-continuwuity {% endfor %} diff --git a/roles/custom/matrix-corporal/tasks/setup_install.yml b/roles/custom/matrix-corporal/tasks/setup_install.yml index 7e64b5a36..271089e85 100644 --- a/roles/custom/matrix-corporal/tasks/setup_install.yml +++ b/roles/custom/matrix-corporal/tasks/setup_install.yml @@ -76,7 +76,7 @@ register: matrix_corporal_support_files_result - name: Ensure Matrix Corporal container network is created - when: matrix_corporal_container_network not in ['', 'host'] + when: matrix_corporal_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_corporal_container_network }}" diff --git a/roles/custom/matrix-corporal/templates/systemd/matrix-corporal.service.j2 b/roles/custom/matrix-corporal/templates/systemd/matrix-corporal.service.j2 index f83ee954b..73cec888e 100644 --- a/roles/custom/matrix-corporal/templates/systemd/matrix-corporal.service.j2 +++ b/roles/custom/matrix-corporal/templates/systemd/matrix-corporal.service.j2 @@ -37,7 +37,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_corporal_container_image }} \ /matrix-corporal -config=/etc/matrix-corporal/config.json -{% if matrix_corporal_container_network not in ['', 'host'] %} +{% if matrix_corporal_container_network != 'host' %} {% for network in matrix_corporal_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-corporal {% endfor %} diff --git a/roles/custom/matrix-dendrite/tasks/setup_install.yml b/roles/custom/matrix-dendrite/tasks/setup_install.yml index b4408d7f6..667a6f5b4 100644 --- a/roles/custom/matrix-dendrite/tasks/setup_install.yml +++ b/roles/custom/matrix-dendrite/tasks/setup_install.yml @@ -118,7 +118,7 @@ when: "matrix_dendrite_git_pull_results.changed | bool or matrix_dendrite_container_image_check_result.stdout == ''" - name: Ensure Dendrite container network is created - when: matrix_dendrite_container_network not in ['', 'host'] + when: matrix_dendrite_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_dendrite_container_network }}" diff --git a/roles/custom/matrix-dendrite/templates/systemd/matrix-dendrite.service.j2 b/roles/custom/matrix-dendrite/templates/systemd/matrix-dendrite.service.j2 index 6077a894b..698ae0835 100644 --- a/roles/custom/matrix-dendrite/templates/systemd/matrix-dendrite.service.j2 +++ b/roles/custom/matrix-dendrite/templates/systemd/matrix-dendrite.service.j2 @@ -57,7 +57,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ -https-bind-address {{ matrix_dendrite_https_bind_address }} {% endif %} -{% if matrix_dendrite_container_network not in ['', 'host'] %} +{% if matrix_dendrite_container_network != 'host' %} {% for network in matrix_dendrite_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-dendrite {% endfor %} diff --git a/roles/custom/matrix-element-admin/tasks/install.yml b/roles/custom/matrix-element-admin/tasks/install.yml index 92c3a4029..5539807f7 100644 --- a/roles/custom/matrix-element-admin/tasks/install.yml +++ b/roles/custom/matrix-element-admin/tasks/install.yml @@ -63,7 +63,7 @@ changed_when: true - name: Ensure Element Admin container network is created - when: matrix_element_admin_container_network not in ['', 'host'] + when: matrix_element_admin_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_element_admin_container_network }}" diff --git a/roles/custom/matrix-element-admin/templates/systemd/matrix-element-admin.service.j2 b/roles/custom/matrix-element-admin/templates/systemd/matrix-element-admin.service.j2 index 807a89543..03511f8f5 100644 --- a/roles/custom/matrix-element-admin/templates/systemd/matrix-element-admin.service.j2 +++ b/roles/custom/matrix-element-admin/templates/systemd/matrix-element-admin.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_element_admin_container_image }} {{ matrix_element_admin_container_process_extra_arguments | join(' ') }} -{% if matrix_element_admin_container_network not in ['', 'host'] %} +{% if matrix_element_admin_container_network != 'host' %} {% for network in matrix_element_admin_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-element-admin {% endfor %} diff --git a/roles/custom/matrix-element-call/tasks/install.yml b/roles/custom/matrix-element-call/tasks/install.yml index 2dc285287..53bb51aec 100644 --- a/roles/custom/matrix-element-call/tasks/install.yml +++ b/roles/custom/matrix-element-call/tasks/install.yml @@ -44,7 +44,7 @@ until: matrix_element_call_container_image_pull_result is not failed - name: Ensure Element Call container network is created - when: matrix_element_call_container_network not in ['', 'host'] + when: matrix_element_call_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_element_call_container_network }}" diff --git a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 index ee03d9c48..13794f7bb 100644 --- a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 +++ b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_element_call_container_image }} -{% if matrix_element_call_container_network not in ['', 'host'] %} +{% if matrix_element_call_container_network != 'host' %} {% for network in matrix_element_call_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-element-call {% endfor %} diff --git a/roles/custom/matrix-ketesa/tasks/setup_install.yml b/roles/custom/matrix-ketesa/tasks/setup_install.yml index 9529f6b84..e112e0cc2 100644 --- a/roles/custom/matrix-ketesa/tasks/setup_install.yml +++ b/roles/custom/matrix-ketesa/tasks/setup_install.yml @@ -102,7 +102,7 @@ register: matrix_ketesa_container_image_build_result - name: Ensure matrix-ketesa container network is created - when: matrix_ketesa_container_network not in ['', 'host'] + when: matrix_ketesa_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_ketesa_container_network }}" diff --git a/roles/custom/matrix-ketesa/templates/systemd/matrix-ketesa.service.j2 b/roles/custom/matrix-ketesa/templates/systemd/matrix-ketesa.service.j2 index ce6446866..809a7e1b7 100644 --- a/roles/custom/matrix-ketesa/templates/systemd/matrix-ketesa.service.j2 +++ b/roles/custom/matrix-ketesa/templates/systemd/matrix-ketesa.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_ketesa_container_image }} -{% if matrix_ketesa_container_network not in ['', 'host'] %} +{% if matrix_ketesa_container_network != 'host' %} {% for network in matrix_ketesa_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-ketesa {% endfor %} diff --git a/roles/custom/matrix-livekit-jwt-service/tasks/install.yml b/roles/custom/matrix-livekit-jwt-service/tasks/install.yml index ea1eade5c..18e09891d 100644 --- a/roles/custom/matrix-livekit-jwt-service/tasks/install.yml +++ b/roles/custom/matrix-livekit-jwt-service/tasks/install.yml @@ -60,7 +60,7 @@ register: matrix_livekit_jwt_service_container_image_build_result - name: Ensure LiveKit JWT Service container network is created - when: matrix_livekit_jwt_service_container_network not in ['', 'host'] + when: matrix_livekit_jwt_service_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_livekit_jwt_service_container_network }}" diff --git a/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 b/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 index 04792b2dc..e0a588348 100644 --- a/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 +++ b/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 @@ -26,7 +26,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --label-file={{ matrix_livekit_jwt_service_base_path }}/labels \ {{ matrix_livekit_jwt_service_container_image }} -{% if matrix_livekit_jwt_service_container_network not in ['', 'host'] %} +{% if matrix_livekit_jwt_service_container_network != 'host' %} {% for network in matrix_livekit_jwt_service_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-livekit-jwt-service {% endfor %} diff --git a/roles/custom/matrix-matrixto/tasks/install.yml b/roles/custom/matrix-matrixto/tasks/install.yml index e60411973..6abed3110 100644 --- a/roles/custom/matrix-matrixto/tasks/install.yml +++ b/roles/custom/matrix-matrixto/tasks/install.yml @@ -46,7 +46,7 @@ - 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 not in ['', 'host'] + - matrix_matrixto_container_network != 'host' community.docker.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_matrixto_container_network }}" @@ -56,7 +56,7 @@ - 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 not in ['', 'host'] + - matrix_matrixto_container_network != 'host' ansible.builtin.command: cmd: >- {{ devture_systemd_docker_base_host_command_docker }} network create diff --git a/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 b/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 index 0c6b2b7e6..a3849f9eb 100644 --- a/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 +++ b/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 @@ -42,7 +42,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_matrixto_container_image_self_build_name }} -{% if matrix_matrixto_container_network not in ['', 'host'] %} +{% if matrix_matrixto_container_network != 'host' %} {% for network in matrix_matrixto_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_matrixto_identifier }} {% endfor %} diff --git a/roles/custom/matrix-media-repo/tasks/setup_install.yml b/roles/custom/matrix-media-repo/tasks/setup_install.yml index dc30c927e..094bdf31e 100755 --- a/roles/custom/matrix-media-repo/tasks/setup_install.yml +++ b/roles/custom/matrix-media-repo/tasks/setup_install.yml @@ -142,7 +142,7 @@ removes: "{{ matrix_media_repo_config_path }}/{{ matrix_media_repo_identifier }}.signing.key.TEMP" - name: Ensure media-repo container network is created - when: matrix_media_repo_container_network not in ['', 'host'] + when: matrix_media_repo_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_media_repo_container_network }}" diff --git a/roles/custom/matrix-media-repo/templates/media-repo/systemd/matrix-media-repo.service.j2 b/roles/custom/matrix-media-repo/templates/media-repo/systemd/matrix-media-repo.service.j2 index 1c1123801..cf0c605d4 100755 --- a/roles/custom/matrix-media-repo/templates/media-repo/systemd/matrix-media-repo.service.j2 +++ b/roles/custom/matrix-media-repo/templates/media-repo/systemd/matrix-media-repo.service.j2 @@ -40,7 +40,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_media_repo_container_image }} -{% if matrix_media_repo_container_network not in ['', 'host'] %} +{% if matrix_media_repo_container_network != 'host' %} {% for network in matrix_media_repo_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_media_repo_identifier }} {% endfor %} diff --git a/roles/custom/matrix-pantalaimon/tasks/install.yml b/roles/custom/matrix-pantalaimon/tasks/install.yml index 1c2db0ae0..8f19974be 100644 --- a/roles/custom/matrix-pantalaimon/tasks/install.yml +++ b/roles/custom/matrix-pantalaimon/tasks/install.yml @@ -59,7 +59,7 @@ register: matrix_pantalaimon_container_image_build_result - name: Ensure pantalaimon container network is created - when: matrix_pantalaimon_container_network not in ['', 'host'] + when: matrix_pantalaimon_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_pantalaimon_container_network }}" diff --git a/roles/custom/matrix-pantalaimon/templates/systemd/matrix-pantalaimon.service.j2 b/roles/custom/matrix-pantalaimon/templates/systemd/matrix-pantalaimon.service.j2 index 962300f42..85fbe9d29 100644 --- a/roles/custom/matrix-pantalaimon/templates/systemd/matrix-pantalaimon.service.j2 +++ b/roles/custom/matrix-pantalaimon/templates/systemd/matrix-pantalaimon.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_pantalaimon_container_image }} -{% if matrix_pantalaimon_container_network not in ['', 'host'] %} +{% if matrix_pantalaimon_container_network != 'host' %} {% for network in matrix_pantalaimon_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-pantalaimon {% endfor %} diff --git a/roles/custom/matrix-rageshake/tasks/install.yml b/roles/custom/matrix-rageshake/tasks/install.yml index 52396545b..e2636066a 100644 --- a/roles/custom/matrix-rageshake/tasks/install.yml +++ b/roles/custom/matrix-rageshake/tasks/install.yml @@ -73,7 +73,7 @@ when: matrix_rageshake_container_image_self_build | bool - name: Ensure rageshake container network is created - when: matrix_rageshake_container_network not in ['', 'host'] + when: matrix_rageshake_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_rageshake_container_network }}" diff --git a/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2 b/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2 index b7e4b5a84..a90ecdb1e 100644 --- a/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2 +++ b/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_rageshake_container_image }} \ --config /config/config.yaml -{% if matrix_rageshake_container_network not in ['', 'host'] %} +{% if matrix_rageshake_container_network != 'host' %} {% for network in matrix_rageshake_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-rageshake {% endfor %} diff --git a/roles/custom/matrix-static-files/tasks/install.yml b/roles/custom/matrix-static-files/tasks/install.yml index 5dc38a0f2..52aa2b73e 100644 --- a/roles/custom/matrix-static-files/tasks/install.yml +++ b/roles/custom/matrix-static-files/tasks/install.yml @@ -94,7 +94,7 @@ until: matrix_static_files_container_image_pull_result is not failed - name: Ensure matrix-static-files container network is created - when: matrix_static_files_container_network not in ['', 'host'] + when: matrix_static_files_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_static_files_container_network }}" diff --git a/roles/custom/matrix-static-files/templates/systemd/matrix-static-files.service.j2 b/roles/custom/matrix-static-files/templates/systemd/matrix-static-files.service.j2 index 623cbee3a..759c4d8cf 100755 --- a/roles/custom/matrix-static-files/templates/systemd/matrix-static-files.service.j2 +++ b/roles/custom/matrix-static-files/templates/systemd/matrix-static-files.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --mount type=bind,src={{ matrix_static_files_config_path }},dst=/config,ro \ {{ matrix_static_files_container_image }} -{% if matrix_static_files_container_network not in ['', 'host'] %} +{% if matrix_static_files_container_network != 'host' %} {% for network in matrix_static_files_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-static-files {% endfor %} diff --git a/roles/custom/matrix-sygnal/tasks/install.yml b/roles/custom/matrix-sygnal/tasks/install.yml index 6b66c685d..bca568ebc 100644 --- a/roles/custom/matrix-sygnal/tasks/install.yml +++ b/roles/custom/matrix-sygnal/tasks/install.yml @@ -49,7 +49,7 @@ until: matrix_sygnal_container_image_pull_result is not failed - name: Ensure Sygnal container network is created - when: matrix_sygnal_container_network not in ['', 'host'] + when: matrix_sygnal_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_sygnal_container_network }}" diff --git a/roles/custom/matrix-sygnal/templates/systemd/matrix-sygnal.service.j2 b/roles/custom/matrix-sygnal/templates/systemd/matrix-sygnal.service.j2 index 331ccb7fc..bea4e9c73 100644 --- a/roles/custom/matrix-sygnal/templates/systemd/matrix-sygnal.service.j2 +++ b/roles/custom/matrix-sygnal/templates/systemd/matrix-sygnal.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_sygnal_container_image }} -{% if matrix_sygnal_container_network not in ['', 'host'] %} +{% if matrix_sygnal_container_network != 'host' %} {% for network in matrix_sygnal_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-sygnal {% endfor %} diff --git a/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml b/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml index 5ff97892f..5fea7dc00 100644 --- a/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml +++ b/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml @@ -83,7 +83,7 @@ when: "matrix_synapse_auto_compressor_git_pull_results.changed | bool or matrix_synapse_auto_compressor_container_image_check_result.stdout == ''" - name: Ensure matrix-synapse-auto-compressor container network is created - when: matrix_synapse_auto_compressor_container_network not in ['', 'host'] + when: matrix_synapse_auto_compressor_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_synapse_auto_compressor_container_network }}" diff --git a/roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor.service.j2 b/roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor.service.j2 index 29f58e7a0..b5a36cefe 100644 --- a/roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor.service.j2 +++ b/roles/custom/matrix-synapse-auto-compressor/templates/matrix-synapse-auto-compressor.service.j2 @@ -33,7 +33,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_synapse_auto_compressor_container_image }} \ -c '{{ matrix_synapse_auto_compressor_command }}' -{% if matrix_synapse_auto_compressor_container_network not in ['', 'host'] %} +{% if matrix_synapse_auto_compressor_container_network != 'host' %} {% for network in matrix_synapse_auto_compressor_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-synapse-auto-compressor {% endfor %} diff --git a/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml b/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml index 02d898a24..ba949861c 100644 --- a/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml +++ b/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml @@ -70,7 +70,7 @@ when: "matrix_synapse_usage_exporter_git_pull_results.changed | bool or matrix_synapse_usage_exporter_container_image_check_result.stdout == ''" - name: Ensure synapse-usage-exporter container network is created - when: matrix_synapse_usage_exporter_container_network not in ['', 'host'] + when: matrix_synapse_usage_exporter_container_network != 'host' community.general.docker_network: name: "{{ matrix_synapse_usage_exporter_container_network }}" driver: bridge diff --git a/roles/custom/matrix-synapse-usage-exporter/templates/systemd/matrix-synapse-usage-exporter.service.j2 b/roles/custom/matrix-synapse-usage-exporter/templates/systemd/matrix-synapse-usage-exporter.service.j2 index 94865e4c5..6a3c8d68f 100644 --- a/roles/custom/matrix-synapse-usage-exporter/templates/systemd/matrix-synapse-usage-exporter.service.j2 +++ b/roles/custom/matrix-synapse-usage-exporter/templates/systemd/matrix-synapse-usage-exporter.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_synapse_usage_exporter_container_image }} -{% if matrix_synapse_usage_exporter_container_network not in ['', 'host'] %} +{% if matrix_synapse_usage_exporter_container_network != 'host' %} {% for network in matrix_synapse_usage_exporter_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_synapse_usage_exporter_identifier }} {% endfor %} diff --git a/roles/custom/matrix-synapse/tasks/reverse_proxy_companion/setup_install.yml b/roles/custom/matrix-synapse/tasks/reverse_proxy_companion/setup_install.yml index ec675b63a..ffefe8a5f 100644 --- a/roles/custom/matrix-synapse/tasks/reverse_proxy_companion/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/reverse_proxy_companion/setup_install.yml @@ -61,7 +61,7 @@ until: matrix_synapse_reverse_proxy_companion_container_image_pull_result is not failed - name: Ensure matrix-synapse-reverse-proxy-companion container network is created - when: matrix_synapse_reverse_proxy_companion_container_network not in ['', 'host'] + when: matrix_synapse_reverse_proxy_companion_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_synapse_reverse_proxy_companion_container_network }}" diff --git a/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml b/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml index 0fff50f79..c0cdae581 100644 --- a/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/synapse/setup_install.yml @@ -129,7 +129,7 @@ group: "{{ matrix_synapse_gid }}" - name: Ensure Synapse container network is created - when: matrix_synapse_container_network not in ['', 'host'] + when: matrix_synapse_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_synapse_container_network }}" diff --git a/roles/custom/matrix-synapse/templates/reverse_proxy_companion/systemd/matrix-synapse-reverse-proxy-companion.service.j2 b/roles/custom/matrix-synapse/templates/reverse_proxy_companion/systemd/matrix-synapse-reverse-proxy-companion.service.j2 index 9b716c5c6..6a47dbf8f 100755 --- a/roles/custom/matrix-synapse/templates/reverse_proxy_companion/systemd/matrix-synapse-reverse-proxy-companion.service.j2 +++ b/roles/custom/matrix-synapse/templates/reverse_proxy_companion/systemd/matrix-synapse-reverse-proxy-companion.service.j2 @@ -45,7 +45,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_synapse_reverse_proxy_companion_container_image }} -{% if matrix_synapse_reverse_proxy_companion_container_network not in ['', 'host'] %} +{% if matrix_synapse_reverse_proxy_companion_container_network != 'host' %} {% for network in matrix_synapse_reverse_proxy_companion_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-synapse-reverse-proxy-companion {% endfor %} diff --git a/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 b/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 index dae48c242..1ff0e9606 100644 --- a/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 @@ -83,7 +83,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_synapse_container_image_final }} \ run -m synapse.app.{{ matrix_synapse_worker_details.app }} -c /data/homeserver.yaml -c /data/{{ matrix_synapse_worker_config_file_name }} -{% if matrix_synapse_container_network not in ['', 'host'] %} +{% if matrix_synapse_container_network != 'host' %} {% for network in matrix_synapse_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_synapse_worker_container_name }} {% endfor %} diff --git a/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 b/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 index 4bcba042e..ecedbaecf 100644 --- a/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 @@ -70,7 +70,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {{ matrix_synapse_container_image_final }} \ run -m synapse.app.homeserver -c /data/homeserver.yaml -{% if matrix_synapse_container_network not in ['', 'host'] %} +{% if matrix_synapse_container_network != 'host' %} {% for network in matrix_synapse_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-synapse {% endfor %} diff --git a/roles/custom/matrix-tuwunel/tasks/install.yml b/roles/custom/matrix-tuwunel/tasks/install.yml index a5a87efc7..4068f67d8 100644 --- a/roles/custom/matrix-tuwunel/tasks/install.yml +++ b/roles/custom/matrix-tuwunel/tasks/install.yml @@ -43,7 +43,7 @@ register: matrix_tuwunel_support_files_result - name: Ensure tuwunel container network is created - when: matrix_tuwunel_container_network not in ['', 'host'] + when: matrix_tuwunel_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_tuwunel_container_network }}" diff --git a/roles/custom/matrix-tuwunel/templates/systemd/matrix-tuwunel.service.j2 b/roles/custom/matrix-tuwunel/templates/systemd/matrix-tuwunel.service.j2 index 1149ea75c..05af8f7ab 100644 --- a/roles/custom/matrix-tuwunel/templates/systemd/matrix-tuwunel.service.j2 +++ b/roles/custom/matrix-tuwunel/templates/systemd/matrix-tuwunel.service.j2 @@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_tuwunel_container_image }} -{% if matrix_tuwunel_container_network not in ['', 'host'] %} +{% if matrix_tuwunel_container_network != 'host' %} {% for network in matrix_tuwunel_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-tuwunel {% endfor %} diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml index 7b33a19fe..ca810c3cd 100644 --- a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml +++ b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml @@ -59,7 +59,7 @@ register: matrix_user_verification_service_config_result - name: Ensure matrix-user-verification-service container network is created - when: matrix_user_verification_service_container_network not in ['', 'host'] + when: matrix_user_verification_service_container_network != 'host' community.general.docker_network: enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}" name: "{{ matrix_user_verification_service_container_network }}" diff --git a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 index c32692e3b..4be4b6446 100644 --- a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 +++ b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endfor %} {{ matrix_user_verification_service_container_image }} -{% if matrix_user_verification_service_container_network not in ['', 'host'] %} +{% if matrix_user_verification_service_container_network != 'host' %} {% for network in matrix_user_verification_service_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_user_verification_service_container_name }} {% endfor %}