From 3fe3d5a78cdf3a2f191b8358f450eb39df9449c6 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 7 Jan 2024 12:04:27 +0200 Subject: [PATCH] Move matrix-bridge-appservice-kakaotalk to its own container network --- group_vars/matrix_servers | 23 +++++++++++-------- .../defaults/main.yml | 11 +++++++-- .../tasks/setup_install.yml | 5 ++++ .../tasks/validate_config.yml | 1 + ...atrix-appservice-kakaotalk-node.service.j2 | 2 +- .../matrix-appservice-kakaotalk.service.j2 | 12 ++++++++-- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index c062d515b..64d1b9dfc 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -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 }}" diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml index 9f86be5fb..edf8046f1 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml @@ -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: '' 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 bcf213cde..585604d02 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml @@ -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" diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml index 63b173395..0641ad748 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml @@ -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} 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 f47f51f7d..c1c87d850 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 @@ -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 }} \ 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 15d2b3525..1fe1b8869 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 @@ -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