From 88ad58fccb2392df98cde6d0180d02db50f11c41 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 7 Jan 2024 09:04:27 +0200 Subject: [PATCH] Move matrix-bot-draupnir to its own container network --- group_vars/matrix_servers | 17 +++++++++-------- .../matrix-bot-draupnir/defaults/main.yml | 11 ++++++++++- .../tasks/validate_config.yml | 3 ++- .../systemd/matrix-bot-draupnir.service.j2 | 12 ++++++++++-- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 08d42a8c9..287bbc201 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -2175,17 +2175,18 @@ matrix_bot_mjolnir_systemd_required_services_list: | # We don't enable bots by default. matrix_bot_draupnir_enabled: false +matrix_bot_draupnir_systemd_required_services_list_auto: | + {{ + matrix_addons_homeserver_systemd_services_list + }} + matrix_bot_draupnir_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" -matrix_bot_draupnir_systemd_required_services_list: | +matrix_bot_draupnir_container_network: "{{ matrix_addons_container_network }}" + +matrix_bot_draupnir_container_additional_networks_auto: |- {{ - ['docker.service'] - + - ['matrix-' + matrix_homeserver_implementation + '.service'] - + - ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else []) - + - (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) + ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) }} ###################################################################### diff --git a/roles/custom/matrix-bot-draupnir/defaults/main.yml b/roles/custom/matrix-bot-draupnir/defaults/main.yml index f63c36f2e..c7fea020c 100644 --- a/roles/custom/matrix-bot-draupnir/defaults/main.yml +++ b/roles/custom/matrix-bot-draupnir/defaults/main.yml @@ -19,11 +19,20 @@ matrix_bot_draupnir_config_path: "{{ matrix_bot_draupnir_base_path }}/config" matrix_bot_draupnir_data_path: "{{ matrix_bot_draupnir_base_path }}/data" matrix_bot_draupnir_docker_src_files_path: "{{ matrix_bot_draupnir_base_path }}/docker-src" +matrix_bot_draupnir_container_network: "" + +matrix_bot_draupnir_container_additional_networks: "{{ matrix_bot_draupnir_container_additional_networks_auto + matrix_bot_draupnir_container_additional_networks_custom }}" +matrix_bot_draupnir_container_additional_networks_auto: [] +matrix_bot_draupnir_container_additional_networks_custom: [] + # A list of extra arguments to pass to the container matrix_bot_draupnir_container_extra_arguments: [] # List of systemd services that matrix-bot-draupnir.service depends on -matrix_bot_draupnir_systemd_required_services_list: ['docker.service'] +matrix_bot_draupnir_systemd_required_services_list: "{{ matrix_bot_draupnir_systemd_required_services_list_default + matrix_bot_draupnir_systemd_required_services_list_auto + matrix_bot_draupnir_systemd_required_services_list_custom }}" +matrix_bot_draupnir_systemd_required_services_list_default: ['docker.service'] +matrix_bot_draupnir_systemd_required_services_list_auto: [] +matrix_bot_draupnir_systemd_required_services_list_custom: [] # List of systemd services that matrix-bot-draupnir.service wants matrix_bot_draupnir_systemd_wanted_services_list: [] diff --git a/roles/custom/matrix-bot-draupnir/tasks/validate_config.yml b/roles/custom/matrix-bot-draupnir/tasks/validate_config.yml index b38281899..b81378c47 100644 --- a/roles/custom/matrix-bot-draupnir/tasks/validate_config.yml +++ b/roles/custom/matrix-bot-draupnir/tasks/validate_config.yml @@ -1,9 +1,10 @@ --- -- name: Fail if required variables are undefined +- name: Fail if required matrix-bot-draupnir variables are undefined ansible.builtin.fail: msg: "The `{{ item }}` variable must be defined and have a non-null value." with_items: - "matrix_bot_draupnir_access_token" - "matrix_bot_draupnir_management_room" + - "matrix_bot_draupnir_container_network" when: "vars[item] == '' or vars[item] is none" diff --git a/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 b/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 index 20a58611a..ff5a49880 100644 --- a/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 +++ b/roles/custom/matrix-bot-draupnir/templates/systemd/matrix-bot-draupnir.service.j2 @@ -19,12 +19,14 @@ 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-bot-draupnir \ +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ + --rm \ + --name=matrix-bot-draupnir \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --cap-drop=ALL \ --read-only \ - --network={{ matrix_docker_network }} \ + --network={{ matrix_bot_draupnir_container_network }} \ --mount type=bind,src={{ matrix_bot_draupnir_config_path }},dst=/data/config,ro \ --mount type=bind,src={{ matrix_bot_draupnir_data_path }},dst=/data \ {% for arg in matrix_bot_draupnir_container_extra_arguments %} @@ -32,6 +34,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name {% endfor %} {{ matrix_bot_draupnir_docker_image }} +{% for network in matrix_bot_draupnir_container_additional_networks %} +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-draupnir +{% endfor %} + +ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-bot-draupnir + 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-bot-draupnir 2>/dev/null || true' ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-draupnir 2>/dev/null || true' Restart=always