mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-22 04:34:00 +00:00
Move matrix-bridge-appservice-kakaotalk to its own container network
This commit is contained in:
parent
dcdc43b6aa
commit
3fe3d5a78c
@ -687,17 +687,22 @@ matrix_appservice_irc_database_password: "{{ '%s' | format(matrix_homeserver_gen
|
||||
# We don't enable bridges by default.
|
||||
matrix_appservice_kakaotalk_enabled: false
|
||||
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list: |
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list_auto: |
|
||||
{{
|
||||
['docker.service']
|
||||
matrix_addons_homeserver_systemd_services_list
|
||||
+
|
||||
['matrix-appservice-kakaotalk-node.service']
|
||||
+
|
||||
['matrix-' + matrix_homeserver_implementation + '.service']
|
||||
+
|
||||
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
|
||||
+
|
||||
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
|
||||
([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_appservice_kakaotalk_database_hostname == devture_postgres_connection_hostname) else [])
|
||||
}}
|
||||
|
||||
matrix_appservice_kakaotalk_container_network: "{{ matrix_addons_container_network }}"
|
||||
|
||||
matrix_appservice_kakaotalk_container_additional_networks_auto: |-
|
||||
{{
|
||||
(
|
||||
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
|
||||
+
|
||||
([devture_postgres_container_network] if (devture_postgres_enabled and matrix_appservice_kakaotalk_database_hostname == devture_postgres_connection_hostname and matrix_appservice_kakaotalk_container_network != devture_postgres_container_network) else [])
|
||||
) | unique
|
||||
}}
|
||||
|
||||
matrix_appservice_kakaotalk_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'as.kakao.hs', rounds=655555) | to_uuid }}"
|
||||
|
@ -54,11 +54,19 @@ matrix_appservice_kakaotalk_appservice_address: 'http://matrix-appservice-kakaot
|
||||
matrix_appservice_kakaotalk_container_extra_arguments: []
|
||||
|
||||
# List of systemd services that matrix-appservice-kakaotalk.service depends on.
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list: ['docker.service', 'matrix-appservice-kakaotalk-node.service']
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list: "{{ matrix_appservice_kakaotalk_systemd_required_services_list_default + matrix_appservice_kakaotalk_systemd_required_services_list_auto + matrix_appservice_kakaotalk_systemd_required_services_list_custom }}"
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list_default: ['docker.service', 'matrix-appservice-kakaotalk-node.service']
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list_auto: []
|
||||
matrix_appservice_kakaotalk_systemd_required_services_list_custom: []
|
||||
|
||||
# List of systemd services that matrix-appservice-kakaotalk.service wants
|
||||
matrix_appservice_kakaotalk_systemd_wanted_services_list: []
|
||||
|
||||
matrix_appservice_kakaotalk_container_network: ""
|
||||
|
||||
matrix_appservice_kakaotalk_container_additional_networks: "{{ matrix_appservice_kakaotalk_container_additional_networks_auto + matrix_appservice_kakaotalk_container_additional_networks_custom }}"
|
||||
matrix_appservice_kakaotalk_container_additional_networks_auto: []
|
||||
matrix_appservice_kakaotalk_container_additional_networks_custom: []
|
||||
|
||||
# A list of extra arguments to pass to the appservice-kakaotalk-node container
|
||||
matrix_appservice_kakaotalk_node_container_extra_arguments: []
|
||||
@ -69,7 +77,6 @@ matrix_appservice_kakaotalk_node_systemd_required_services_list: ['docker.servic
|
||||
# List of systemd services that matrix-appservice-kakaotalk-node.service wants
|
||||
matrix_appservice_kakaotalk_node_systemd_wanted_services_list: []
|
||||
|
||||
|
||||
matrix_appservice_kakaotalk_appservice_token: ''
|
||||
matrix_appservice_kakaotalk_homeserver_token: ''
|
||||
|
||||
|
@ -97,6 +97,11 @@
|
||||
owner: "{{ matrix_user_username }}"
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
|
||||
- name: Ensure matrix-appservice-kakaotalk container network is created
|
||||
community.general.docker_network:
|
||||
name: "{{ matrix_appservice_kakaotalk_container_network }}"
|
||||
driver: bridge
|
||||
|
||||
- name: Ensure matrix-appservice-kakaotalk-node.service installed
|
||||
ansible.builtin.template:
|
||||
src: "{{ role_path }}/templates/systemd/matrix-appservice-kakaotalk-node.service.j2"
|
||||
|
@ -9,3 +9,4 @@
|
||||
- {'name': 'matrix_appservice_kakaotalk_appservice_token', when: true}
|
||||
- {'name': 'matrix_appservice_kakaotalk_homeserver_token', when: true}
|
||||
- {'name': 'matrix_appservice_kakaotalk_database_hostname', when: "{{ matrix_appservice_kakaotalk_database_engine == 'postgres' }}"}
|
||||
- {'name': 'matrix_appservice_kakaotalk_container_network', when: true}
|
||||
|
@ -20,7 +20,7 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
|
||||
--log-driver=none \
|
||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||
--cap-drop=ALL \
|
||||
--network={{ matrix_docker_network }} \
|
||||
--network={{ matrix_appservice_kakaotalk_container_network }} \
|
||||
--mount type=bind,src={{ matrix_appservice_kakaotalk_config_path }}/node-config.json,dst=/config.json,ro \
|
||||
{% for arg in matrix_appservice_kakaotalk_node_container_extra_arguments %}
|
||||
{{ arg }} \
|
||||
|
@ -19,11 +19,13 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
|
||||
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
||||
ExecStartPre={{ matrix_host_command_sleep }} 5
|
||||
|
||||
ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-appservice-kakaotalk \
|
||||
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_docker_network }} \
|
||||
--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 %}
|
||||
@ -32,6 +34,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
|
||||
{{ matrix_appservice_kakaotalk_docker_image }} \
|
||||
python3 -m matrix_appservice_kakaotalk -c /config/config.yaml --no-update
|
||||
|
||||
{% for network in matrix_appservice_discord_container_additional_networks %}
|
||||
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-appservice-kakaotalk
|
||||
{% endfor %}
|
||||
|
||||
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 --time={{ 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
|
||||
|
Loading…
Reference in New Issue
Block a user