mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-14 07:31:06 +00:00
Kevin Veen-Birkenbach
bd6e08a93e
* feat: support container_network=host across all roles + systemd templates
Mirror the pattern Slavi introduced for matrix-coturn (aafa8f0) across the
fork: every 'Ensure X container network is created' task gets a
'when: <var> not in ["", "host"]' guard so MDAD does not try to
docker_network create a network literally named 'host' (returns 403,
since host is a pre-defined Docker network).
Mirror the same guard in every systemd unit template that does
'ExecStartPre=docker network connect <addnet> <container>' loops over
matrix_<role>_container_additional_networks: skip the connects when the
container is on host networking (where additional --network attaches
are invalid).
Unblocks DiD setups where MDAD-managed containers share their host's
network namespace (matrix-mdad outer compose service joined to central
postgres/openldap networks) to reach external services on the outer
Docker daemon.
* Simplify container network guards (!= 'host') and fix duplicate when
Guarding on the empty string ('') as well was misleading: systemd unit
templates still render an unconditional --network= flag, so an empty
network value produces a broken docker create command. Only 'host' is
actually supported, so only guard on that. This also matches the
existing convention in the Traefik role
(when: traefik_container_network != 'host').
Also fix a duplicate when key in the meshtastic-relay role, where the
network-creation task already had a when condition - the two are now
combined into a list.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
54 lines
2.6 KiB
Django/Jinja
54 lines
2.6 KiB
Django/Jinja
#jinja2: lstrip_blocks: True
|
||
[Unit]
|
||
Description=Conduit Matrix homeserver
|
||
{% for service in matrix_conduit_systemd_required_services_list %}
|
||
Requires={{ service }}
|
||
After={{ service }}
|
||
{% endfor %}
|
||
|
||
[Service]
|
||
Type=simple
|
||
Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
|
||
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-conduit 2>/dev/null || true'
|
||
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-conduit 2>/dev/null || true'
|
||
|
||
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
||
--rm \
|
||
--name=matrix-conduit \
|
||
--log-driver=none \
|
||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||
--cap-drop=ALL \
|
||
--read-only \
|
||
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_conduit_tmp_directory_size_mb }}m \
|
||
--network={{ matrix_conduit_container_network }} \
|
||
--env CONDUIT_CONFIG=/etc/matrix-conduit/conduit.toml \
|
||
--label-file={{ matrix_conduit_base_path }}/labels \
|
||
--mount type=bind,src={{ matrix_conduit_data_path }},dst=/var/lib/matrix-conduit \
|
||
--mount type=bind,src={{ matrix_conduit_config_path }},dst=/etc/matrix-conduit,ro \
|
||
{% for arg in matrix_conduit_container_extra_arguments %}
|
||
{{ arg }} \
|
||
{% endfor %}
|
||
{{ matrix_conduit_container_image }}
|
||
|
||
{% 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 %}
|
||
{% endif %}
|
||
|
||
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-conduit
|
||
|
||
{% if matrix_conduit_systemd_service_post_start_delay_seconds != 0 %}
|
||
ExecStartPost=-{{ matrix_host_command_sleep }} {{ matrix_conduit_systemd_service_post_start_delay_seconds }}
|
||
{% endif %}
|
||
|
||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop -t {{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-conduit 2>/dev/null || true'
|
||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-conduit 2>/dev/null || true'
|
||
ExecReload={{ devture_systemd_docker_base_host_command_docker }} exec matrix-conduit /bin/sh -c 'kill -HUP 1'
|
||
Restart=always
|
||
RestartSec=30
|
||
SyslogIdentifier=matrix-conduit
|
||
|
||
[Install]
|
||
WantedBy=multi-user.target
|