From 867af6385a7dc1c3a53d7c0e095536f5f0b6a8aa Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 7 Jan 2024 09:20:24 +0200
Subject: [PATCH] Move matrix-bot-mjolnir to its own container network

---
 group_vars/matrix_servers                       | 17 +++++++++--------
 .../custom/matrix-bot-mjolnir/defaults/main.yml | 11 ++++++++++-
 .../systemd/matrix-bot-mjolnir.service.j2       | 12 ++++++++++--
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 287bbc201..36badc5ec 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -2147,17 +2147,18 @@ matrix_bot_go_neb_systemd_required_services_list: |
 # We don't enable bots by default.
 matrix_bot_mjolnir_enabled: false
 
+matrix_bot_mjolnir_systemd_required_services_list_auto: |
+  {{
+    matrix_addons_homeserver_systemd_services_list
+  }}
+
 matrix_bot_mjolnir_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
 
-matrix_bot_mjolnir_systemd_required_services_list: |
+matrix_bot_mjolnir_container_network: "{{ matrix_addons_container_network }}"
+
+matrix_bot_mjolnir_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-mjolnir/defaults/main.yml b/roles/custom/matrix-bot-mjolnir/defaults/main.yml
index 1c1744774..4b5ac95bd 100644
--- a/roles/custom/matrix-bot-mjolnir/defaults/main.yml
+++ b/roles/custom/matrix-bot-mjolnir/defaults/main.yml
@@ -19,11 +19,20 @@ matrix_bot_mjolnir_config_path: "{{ matrix_bot_mjolnir_base_path }}/config"
 matrix_bot_mjolnir_data_path: "{{ matrix_bot_mjolnir_base_path }}/data"
 matrix_bot_mjolnir_docker_src_files_path: "{{ matrix_bot_mjolnir_base_path }}/docker-src"
 
+matrix_bot_mjolnir_container_network: ""
+
+matrix_bot_mjolnir_container_additional_networks: "{{ matrix_bot_mjolnir_container_additional_networks_auto + matrix_bot_mjolnir_container_additional_networks_custom }}"
+matrix_bot_mjolnir_container_additional_networks_auto: []
+matrix_bot_mjolnir_container_additional_networks_custom: []
+
 # A list of extra arguments to pass to the container
 matrix_bot_mjolnir_container_extra_arguments: []
 
 # List of systemd services that matrix-bot-mjolnir.service depends on
-matrix_bot_mjolnir_systemd_required_services_list: ['docker.service']
+matrix_bot_mjolnir_systemd_required_services_list: "{{ matrix_bot_mjolnir_systemd_required_services_list_default + matrix_bot_mjolnir_systemd_required_services_list_auto + matrix_bot_mjolnir_systemd_required_services_list_custom }}"
+matrix_bot_mjolnir_systemd_required_services_list_default: ['docker.service']
+matrix_bot_mjolnir_systemd_required_services_list_auto: []
+matrix_bot_mjolnir_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-bot-mjolnir.service wants
 matrix_bot_mjolnir_systemd_wanted_services_list: []
diff --git a/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2 b/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2
index 6d1e91945..923e7bbc5 100644
--- a/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2
+++ b/roles/custom/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.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-mjolnir \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-bot-mjolnir \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
 			--read-only \
-			--network={{ matrix_docker_network }} \
+			--network={{ matrix_bot_mjolnir_container_network }} \
 			--mount type=bind,src={{ matrix_bot_mjolnir_config_path }},dst=/data/config,ro \
 			--mount type=bind,src={{ matrix_bot_mjolnir_data_path }},dst=/data \
 			{% for arg in matrix_bot_mjolnir_container_extra_arguments %}
@@ -32,6 +34,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
 			{% endfor %}
 			{{ matrix_bot_mjolnir_docker_image }}
 
+{% for network in matrix_bot_mjolnir_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-mjolnir
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-bot-mjolnir
+
 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-mjolnir 2>/dev/null || true'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-mjolnir 2>/dev/null || true'
 Restart=always