Put all homeservers in the matrix-homeserver container network

roles/custom/matrix-base/defaults/main.yml

@@ -142,7 +142,7 @@ matrix_host_command_openssl: "/usr/bin/env openssl"
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
 # Specifies on which container network the homeserver is.
-matrix_homeserver_container_network: ""
+matrix_homeserver_container_network: "matrix-homeserver"
 
 # Specifies which systemd services are responsible for the homeserver
 matrix_homeserver_systemd_services_list: []

roles/custom/matrix-conduit/defaults/main.yml

@@ -19,13 +19,16 @@ matrix_conduit_port_number: 6167
 matrix_conduit_tmp_directory_size_mb: 500
 
 # List of systemd services that matrix-conduit.service depends on
-matrix_conduit_systemd_required_services_list: ["docker.service"]
+matrix_conduit_systemd_required_services_list: "{{ matrix_conduit_systemd_required_services_list_default + matrix_conduit_systemd_required_services_list_auto + matrix_conduit_systemd_required_services_list_custom }}"
+matrix_conduit_systemd_required_services_list_default: ["docker.service"]
+matrix_conduit_systemd_required_services_list_auto: []
+matrix_conduit_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-conduit.service wants
 matrix_conduit_systemd_wanted_services_list: []
 
 # The base container network. It will be auto-created by this role if it doesn't exist already.
-matrix_conduit_container_network: "{{ matrix_docker_network }}"
+matrix_conduit_container_network: ""
 
 # A list of additional container networks that the container would be connected to.
 # The role does not create these networks, so make sure they already exist.

roles/custom/matrix-conduit/tasks/main.yml

@@ -6,6 +6,9 @@
     - install-all
     - install-conduit
   block:
+    - when: matrix_conduit_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
+
     - when: matrix_conduit_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
 

roles/custom/matrix-conduit/tasks/validate_config.yml

@@ -0,0 +1,9 @@
+---
+
+- name: Fail if required Conduit settings not defined
+  ansible.builtin.fail:
+    msg: >-
+      You need to define a required configuration setting (`{{ item.name }}`).
+  when: "item.when | bool and vars[item.name] == ''"
+  with_items:
+    - {'name': 'matrix_conduit_container_network', when: true}

roles/custom/matrix-dendrite/defaults/main.yml

@@ -41,7 +41,7 @@ matrix_dendrite_http_bind_address: "{{ (':' + matrix_dendrite_http_bind_port | s
 matrix_dendrite_https_bind_address: "{{ (':' + matrix_dendrite_https_bind_port | string) if matrix_dendrite_https_bind_port else '' }}"
 
 # The base container network. It will be auto-created by this role if it doesn't exist already.
-matrix_dendrite_container_network: "{{ matrix_docker_network }}"
+matrix_dendrite_container_network: ""
 
 # A list of additional container networks that the container would be connected to.
 # The role does not create these networks, so make sure they already exist.
@@ -80,7 +80,10 @@ matrix_dendrite_container_arguments: "{{ matrix_dendrite_container_extra_argumen
 matrix_dendrite_process_extra_arguments: []
 
 # List of systemd services that matrix-dendrite.service depends on
-matrix_dendrite_systemd_required_services_list: ["docker.service"]
+matrix_dendrite_systemd_required_services_list: "{{ matrix_dendrite_systemd_required_services_list_default + matrix_dendrite_systemd_required_services_list_auto + matrix_dendrite_systemd_required_services_list_custom }}"
+matrix_dendrite_systemd_required_services_list_default: ["docker.service"]
+matrix_dendrite_systemd_required_services_list_auto: []
+matrix_dendrite_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-dendrite.service wants
 matrix_dendrite_systemd_wanted_services_list: []

roles/custom/matrix-synapse/defaults/main.yml

@@ -115,7 +115,7 @@ matrix_synapse_container_federation_api_tls_port: 8448
 matrix_synapse_container_federation_api_plain_port: 8048
 
 # The base container network. It will be auto-created by this role if it doesn't exist already.
-matrix_synapse_container_network: "{{ matrix_docker_network }}"
+matrix_synapse_container_network: ''
 
 # A list of additional container networks that the container would be connected to.
 # The role does not create these networks, so make sure they already exist.