From c78b02cbe7534b8240217351048ed2f3ff9363ec Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 21 May 2019 11:13:52 +0900 Subject: [PATCH] Make bridges not depend on matrix-synapse.service if not enabled --- group_vars/matrix-servers | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/group_vars/matrix-servers b/group_vars/matrix-servers index 8d23b32a3..9defecaef 100755 --- a/group_vars/matrix-servers +++ b/group_vars/matrix-servers @@ -39,7 +39,12 @@ matrix_appservice_discord_enabled: false # matrix-appservice-discord's client-server port to the local host (`127.0.0.1:9005`). matrix_appservice_discord_container_expose_client_server_api_port: "{{ not matrix_nginx_proxy_enabled }}" -matrix_appservice_discord_systemd_required_services_list: ['docker.service', 'matrix-synapse.service'] +matrix_appservice_discord_systemd_required_services_list: | + {{ + ['docker.service'] + + + (['matrix-synapse.service'] if matrix_synapse_enabled else []) + }} ###################################################################### # @@ -62,7 +67,12 @@ matrix_appservice_irc_enabled: false # matrix-appservice-irc's client-server port to the local host (`127.0.0.1:9999`). matrix_appservice_irc_container_expose_client_server_api_port: "{{ not matrix_nginx_proxy_enabled }}" -matrix_appservice_irc_systemd_required_services_list: ['docker.service', 'matrix-synapse.service'] +matrix_appservice_irc_systemd_required_services_list: | + {{ + ['docker.service'] + + + (['matrix-synapse.service'] if matrix_synapse_enabled else []) + }} ###################################################################### # @@ -80,7 +90,12 @@ matrix_appservice_irc_systemd_required_services_list: ['docker.service', 'matrix # We don't enable bridges by default. matrix_mautrix_facebook_enabled: false -matrix_mautrix_facebook_systemd_required_services_list: ['docker.service', 'matrix-synapse.service'] +matrix_mautrix_facebook_systemd_required_services_list: | + {{ + ['docker.service'] + + + (['matrix-synapse.service'] if matrix_synapse_enabled else []) + }} ###################################################################### # @@ -98,7 +113,12 @@ matrix_mautrix_facebook_systemd_required_services_list: ['docker.service', 'matr # We don't enable bridges by default. matrix_mautrix_telegram_enabled: false -matrix_mautrix_telegram_systemd_required_services_list: ['docker.service', 'matrix-synapse.service'] +matrix_mautrix_telegram_systemd_required_services_list: | + {{ + ['docker.service'] + + + (['matrix-synapse.service'] if matrix_synapse_enabled else []) + }} matrix_mautrix_telegram_public_endpoint: "/{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'telegram') | to_uuid }}" @@ -118,7 +138,12 @@ matrix_mautrix_telegram_public_endpoint: "/{{ matrix_synapse_macaroon_secret_key # We don't enable bridges by default. matrix_mautrix_whatsapp_enabled: false -matrix_mautrix_whatsapp_systemd_required_services_list: ['docker.service', 'matrix-synapse.service'] +matrix_mautrix_whatsapp_systemd_required_services_list: | + {{ + ['docker.service'] + + + (['matrix-synapse.service'] if matrix_synapse_enabled else []) + }} ###################################################################### #