Remove a few remaining hardcoded docker.service references

Continuation of 9f2eff2ac7

Provoked by 7749048bf8
(https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3353)

group_vars/matrix_servers

@@ -2873,7 +2873,7 @@ backup_borg_location_exclude_patterns: |
 
 backup_borg_systemd_required_services_list: |
   {{
-    ['docker.service']
+    [devture_systemd_docker_base_docker_service_name]
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
   }}
@@ -3090,7 +3090,7 @@ matrix_coturn_container_additional_volumes: |
 
 matrix_coturn_systemd_required_services_list: |
   {{
-    ['docker.service']
+    [devture_systemd_docker_base_docker_service_name]
     +
     ([devture_traefik_certs_dumper_identifier + '-wait-for-domain@' + matrix_server_fqn_matrix + '.service'] if matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] and devture_traefik_certs_dumper_enabled and matrix_coturn_tls_enabled else [])
   }}
@@ -3208,7 +3208,7 @@ etherpad_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certReso
 
 etherpad_systemd_required_services_list: |
   {{
-    ['docker.service']
+    [devture_systemd_docker_base_docker_service_name]
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
   }}
@@ -5184,7 +5184,7 @@ matrix_user_verification_service_enabled: false
 
 matrix_user_verification_service_systemd_required_services_list: |
   {{
-    ['docker.service']
+    [devture_systemd_docker_base_docker_service_name]
     +
     (['matrix-' + matrix_homeserver_implementation + '.service'])
   }}
@@ -5325,7 +5325,7 @@ devture_traefik_container_additional_networks_auto: |
 
 devture_traefik_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name])
     +
     ([devture_container_socket_proxy_identifier + '.service'] if devture_container_socket_proxy_enabled else [])
   }}

roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml

@@ -55,7 +55,12 @@ matrix_appservice_kakaotalk_container_extra_arguments: []
 
 # List of systemd services that matrix-appservice-kakaotalk.service depends on.
 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_default: |-
+  {{
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
+    +
+    ['matrix-appservice-kakaotalk-node.service']
+  }}
 matrix_appservice_kakaotalk_systemd_required_services_list_auto: []
 matrix_appservice_kakaotalk_systemd_required_services_list_custom: []
 

roles/custom/matrix-bridge-mautrix-wsproxy/defaults/main.yml

@@ -141,7 +141,12 @@ matrix_mautrix_wsproxy_syncproxy_docker_image: "dock.mau.dev/mautrix/syncproxy:{
 matrix_mautrix_wsproxy_syncproxy_docker_image_force_pull: "{{ matrix_mautrix_wsproxy_syncproxy_docker_image.endswith(':latest') }}"
 matrix_mautrix_wsproxy_syncproxy_container_extra_arguments: []
 
-matrix_mautrix_wsproxy_syncproxy_systemd_required_services_list: ['docker.service', 'matrix-mautrix-wsproxy.service']
+matrix_mautrix_wsproxy_syncproxy_systemd_required_services_list: |-
+  {{
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
+    +
+    ['matrix-mautrix-wsproxy.service']
+  }}
 matrix_mautrix_wsproxy_syncproxy_systemd_wanted_services_list: []
 
 matrix_mautrix_wsproxy_syncproxy_homeserver_url: ''

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

@@ -23,7 +23,7 @@ matrix_conduit_tmp_directory_size_mb: 500
 
 # List of systemd services that matrix-conduit.service depends on
 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_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 matrix_conduit_systemd_required_services_list_auto: []
 matrix_conduit_systemd_required_services_list_custom: []
 

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

@@ -178,13 +178,13 @@ matrix_dendrite_process_extra_arguments: []
 
 # List of systemd services that matrix-dendrite.service depends on
 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_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 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: "{{ matrix_dendrite_systemd_wanted_services_list_default + matrix_dendrite_systemd_wanted_services_list_auto + matrix_dendrite_systemd_wanted_services_list_custom }}"
-matrix_dendrite_systemd_wanted_services_list_default: ["docker.service"]
+matrix_dendrite_systemd_wanted_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 matrix_dendrite_systemd_wanted_services_list_auto: []
 matrix_dendrite_systemd_wanted_services_list_custom: []
 

roles/custom/matrix-media-repo/defaults/main.yml

@@ -29,7 +29,7 @@ matrix_media_repo_docker_src_files_path: "{{ matrix_media_repo_base_path }}/dock
 
 # List of systemd services that matrix-media-repo.service depends on
 matrix_media_repo_systemd_required_services_list: "{{ matrix_media_repo_systemd_required_services_list_default + matrix_media_repo_systemd_required_services_list_auto + matrix_media_repo_systemd_required_services_list_custom }}"
-matrix_media_repo_systemd_required_services_list_default: ["docker.service"]
+matrix_media_repo_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 matrix_media_repo_systemd_required_services_list_auto: []
 matrix_media_repo_systemd_required_services_list_custom: []
 

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

@@ -81,7 +81,7 @@ matrix_rageshake_container_labels_additional_labels: ''
 matrix_rageshake_container_extra_arguments: []
 
 # List of systemd services that matrix-rageshake.service depends on
-matrix_rageshake_systemd_required_services_list: ["docker.service"]
+matrix_rageshake_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 
 # List of systemd services that matrix-rageshake.service wants
 matrix_rageshake_systemd_wanted_services_list: []

roles/custom/matrix-sliding-sync/defaults/main.yml

@@ -73,7 +73,7 @@ matrix_sliding_sync_container_extra_arguments: []
 
 # List of systemd services that matrix-sliding-sync-proxy.service depends on
 matrix_sliding_sync_systemd_required_services_list: "{{ matrix_sliding_sync_systemd_required_services_list_default + matrix_sliding_sync_systemd_required_services_list_auto + matrix_sliding_sync_systemd_required_services_list_custom }}"
-matrix_sliding_sync_systemd_required_services_list_default: ["docker.service"]
+matrix_sliding_sync_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 matrix_sliding_sync_systemd_required_services_list_auto: []
 matrix_sliding_sync_systemd_required_services_list_custom: []
 

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

@@ -320,6 +320,12 @@ matrix_synapse_systemd_wanted_services_list_default: []
 matrix_synapse_systemd_wanted_services_list_auto: []
 matrix_synapse_systemd_wanted_services_list_custom: []
 
+# List of systemd services that matrix-goofys.service depends on
+matrix_synapse_goofys_systemd_required_services_list: "{{ matrix_synapse_goofys_systemd_required_services_list_default + matrix_synapse_goofys_systemd_required_services_list_auto + matrix_synapse_goofys_systemd_required_services_list_custom }}"
+matrix_synapse_goofys_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
+matrix_synapse_goofys_systemd_required_services_list_auto: []
+matrix_synapse_goofys_systemd_required_services_list_custom: []
+
 # Controls how long to sleep for after starting the matrix-synapse container.
 #
 # Delaying, so that the homeserver can manage to fully start and various services

roles/custom/matrix-synapse/templates/goofys/systemd/matrix-goofys.service.j2

@@ -1,8 +1,9 @@
 #jinja2: lstrip_blocks: "True"
 [Unit]
 Description=Matrix Goofys media store
-After=docker.service
-Requires=docker.service
+{% for service in matrix_synapse_goofys_systemd_required_services_list %}
+Requires={{ service }}
+After={{ service }}
 DefaultDependencies=no
 
 [Service]