finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make bridges not depend on matrix-synapse.service if not enabled

Browse Source
This commit is contained in:
Slavi Pantaleev 2019-05-21 11:13:52 +09:00
parent 3ece9375c6
commit c78b02cbe7
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
group_vars/matrix-servers
View File

@ -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'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_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'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_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. # We don't enable bridges by default.
matrix_mautrix_facebook_enabled: false 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. # We don't enable bridges by default.
matrix_mautrix_telegram_enabled: false 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 }}" 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. # We don't enable bridges by default.
matrix_mautrix_whatsapp_enabled: false 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 [])
}}
###################################################################### ######################################################################
# #