mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-06-14 23:51:08 +00:00
Slavi Pantaleev
ce8beb5e9d
The additional-networks connect loop in the kakaotalk systemd unit template iterated over matrix_appservice_discord_container_additional_networks, a copy-paste leftover from the discord bridge role. The host-network guard added in #5310 mirrored the same wrong variable. This means the kakaotalk container was being connected to the networks computed for the discord bridge instead of its own, potentially leaving it without access to its homeserver/database networks depending on the discord bridge's configuration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
50 lines
2.4 KiB
Django/Jinja
50 lines
2.4 KiB
Django/Jinja
#jinja2: lstrip_blocks: True
|
|
[Unit]
|
|
Description=appservice-kakaotalk bridge
|
|
{% for service in matrix_appservice_kakaotalk_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
{% for service in matrix_appservice_kakaotalk_systemd_wanted_services_list %}
|
|
Wants={{ service }}
|
|
{% endfor %}
|
|
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-appservice-kakaotalk 2>/dev/null || true'
|
|
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-appservice-kakaotalk 2>/dev/null || true'
|
|
|
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|
--rm \
|
|
--name=matrix-appservice-kakaotalk \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--network={{ matrix_appservice_kakaotalk_container_network }} \
|
|
--mount type=bind,src={{ matrix_appservice_kakaotalk_config_path }},dst=/config,ro \
|
|
--mount type=bind,src={{ matrix_appservice_kakaotalk_data_path }},dst=/data \
|
|
{% for arg in matrix_appservice_kakaotalk_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_appservice_kakaotalk_container_image }} \
|
|
python3 -m matrix_appservice_kakaotalk -c /config/config.yaml --no-update
|
|
|
|
{% 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
|
|
{% endfor %}
|
|
{% endif %}
|
|
|
|
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-appservice-kakaotalk
|
|
|
|
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-appservice-kakaotalk 2>/dev/null || true'
|
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-appservice-kakaotalk 2>/dev/null || true'
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-appservice-kakaotalk
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|