mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-11 11:34:52 +03:00
Kevin Veen-Birkenbach
bd6e08a93e
* feat: support container_network=host across all roles + systemd templates
Mirror the pattern Slavi introduced for matrix-coturn (aafa8f0) across the
fork: every 'Ensure X container network is created' task gets a
'when: <var> not in ["", "host"]' guard so MDAD does not try to
docker_network create a network literally named 'host' (returns 403,
since host is a pre-defined Docker network).
Mirror the same guard in every systemd unit template that does
'ExecStartPre=docker network connect <addnet> <container>' loops over
matrix_<role>_container_additional_networks: skip the connects when the
container is on host networking (where additional --network attaches
are invalid).
Unblocks DiD setups where MDAD-managed containers share their host's
network namespace (matrix-mdad outer compose service joined to central
postgres/openldap networks) to reach external services on the outer
Docker daemon.
* Simplify container network guards (!= 'host') and fix duplicate when
Guarding on the empty string ('') as well was misleading: systemd unit
templates still render an unconditional --network= flag, so an empty
network value produces a broken docker create command. Only 'host' is
actually supported, so only guard on that. This also matches the
existing convention in the Traefik role
(when: traefik_container_network != 'host').
Also fix a duplicate when key in the meshtastic-relay role, where the
network-creation task already had a when condition - the two are now
combined into a list.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
99 lines
4.9 KiB
Django/Jinja
99 lines
4.9 KiB
Django/Jinja
#jinja2: lstrip_blocks: True
|
|
[Unit]
|
|
Description=Synapse server
|
|
{% for service in matrix_synapse_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
|
|
{% endfor %}
|
|
{% for service in matrix_synapse_systemd_wanted_services_list %}
|
|
Wants={{ service }}
|
|
{% endfor %}
|
|
|
|
{% if matrix_synapse_workers_enabled %}
|
|
{% for matrix_synapse_worker_details in matrix_synapse_workers_enabled_list %}
|
|
Wants={{ matrix_synapse_worker_details.name }}.service
|
|
{% endfor %}
|
|
{% endif %}
|
|
|
|
DefaultDependencies=no
|
|
|
|
[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-synapse 2>/dev/null || true'
|
|
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-synapse 2>/dev/null || true'
|
|
|
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|
--rm \
|
|
--name=matrix-synapse \
|
|
--log-driver=none \
|
|
--user={{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} \
|
|
--cap-drop=ALL \
|
|
--read-only \
|
|
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_synapse_tmp_directory_size_mb }}m \
|
|
--network={{ matrix_synapse_container_network }} \
|
|
--health-interval={{ matrix_synapse_container_health_interval }} \
|
|
{% if matrix_synapse_container_client_api_host_bind_port %}
|
|
-p {{ matrix_synapse_container_client_api_host_bind_port }}:{{ matrix_synapse_container_client_api_port }} \
|
|
{% endif %}
|
|
{% if matrix_synapse_federation_enabled and matrix_synapse_tls_federation_listener_enabled and matrix_synapse_container_federation_api_tls_host_bind_port %}
|
|
-p {{ matrix_synapse_container_federation_api_tls_host_bind_port }}:{{ matrix_synapse_container_federation_api_tls_port }} \
|
|
{% endif %}
|
|
{% if matrix_synapse_federation_enabled and matrix_synapse_federation_port_enabled and matrix_synapse_container_federation_api_plain_host_bind_port %}
|
|
-p {{ matrix_synapse_container_federation_api_plain_host_bind_port }}:{{ matrix_synapse_container_federation_api_plain_port }} \
|
|
{% endif %}
|
|
{% if matrix_synapse_metrics_enabled and matrix_synapse_container_metrics_api_host_bind_port %}
|
|
-p {{ matrix_synapse_container_metrics_api_host_bind_port }}:{{ matrix_synapse_metrics_port }} \
|
|
{% endif %}
|
|
{% if matrix_synapse_manhole_enabled and matrix_synapse_container_manhole_api_host_bind_port %}
|
|
-p {{ matrix_synapse_container_manhole_api_host_bind_port }}:9000 \
|
|
{% endif %}
|
|
--mount type=bind,src={{ matrix_synapse_config_dir_path }},dst=/data,ro \
|
|
--mount type=bind,src={{ matrix_synapse_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \
|
|
{% if matrix_synapse_redis_path_enabled %}
|
|
--mount type=bind,src={{ matrix_synapse_redis_path_host }},dst={{ matrix_synapse_redis_path }} \
|
|
{% endif %}
|
|
{% if matrix_synapse_database_socket_enabled %}
|
|
--mount type=bind,src={{ matrix_synapse_database_socket_path_host }},dst={{ matrix_synapse_database_socket_path }} \
|
|
{% endif %}
|
|
--label-file={{ matrix_synapse_base_path }}/labels \
|
|
{% for volume in matrix_synapse_container_additional_volumes %}
|
|
--mount type={{ volume.type | default('bind' if '/' in volume.src else 'volume') }},src={{ volume.src }},dst={{ volume.dst }}{{ (',' + volume.options) if volume.options else '' }} \
|
|
{% endfor %}
|
|
{% for arg in matrix_synapse_container_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{% for arg in matrix_synapse_container_master_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_synapse_container_image_final }} \
|
|
run -m synapse.app.homeserver -c /data/homeserver.yaml
|
|
|
|
{% 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 %}
|
|
{% endif %}
|
|
|
|
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-synapse
|
|
|
|
{% if matrix_synapse_systemd_healthcheck_enabled %}
|
|
ExecStartPost={{ matrix_synapse_systemd_healthcheck_command }}
|
|
{% endif %}
|
|
|
|
{% if matrix_synapse_systemd_service_post_start_delay_seconds | int > 0 %}
|
|
ExecStartPost=-{{ matrix_host_command_sleep }} {{ matrix_synapse_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-synapse 2>/dev/null || true'
|
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-synapse 2>/dev/null || true'
|
|
|
|
ExecReload={{ devture_systemd_docker_base_host_command_docker }} exec matrix-synapse /bin/sh -c 'kill -HUP 1'
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-synapse
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|