Replace matrix-synapse.service references with more homeserver-neutral references

This commit is contained in:
Slavi Pantaleev 2021-12-23 18:01:48 +02:00
parent 38ad152c03
commit 593fc2fa85

View File

@ -78,7 +78,7 @@ matrix_appservice_discord_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -128,7 +128,7 @@ matrix_appservice_webhooks_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -167,7 +167,7 @@ matrix_appservice_slack_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -206,7 +206,7 @@ matrix_appservice_irc_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -241,7 +241,7 @@ matrix_beeper_linkedin_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -279,7 +279,7 @@ matrix_mautrix_facebook_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -321,7 +321,7 @@ matrix_mautrix_hangouts_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -362,7 +362,7 @@ matrix_mautrix_googlechat_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -403,7 +403,7 @@ matrix_mautrix_instagram_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -443,7 +443,7 @@ matrix_mautrix_signal_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -492,7 +492,7 @@ matrix_mautrix_telegram_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -534,7 +534,7 @@ matrix_mautrix_twitter_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -573,7 +573,7 @@ matrix_mautrix_whatsapp_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -609,7 +609,7 @@ matrix_sms_bridge_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -640,7 +640,7 @@ matrix_heisenbridge_homeserver_token: "{{ '%s' | format(matrix_homeserver_generi
matrix_heisenbridge_systemd_wanted_services_list: | matrix_heisenbridge_systemd_wanted_services_list: |
{{ {{
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -666,7 +666,7 @@ matrix_mx_puppet_skype_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -705,7 +705,7 @@ matrix_mx_puppet_slack_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -743,7 +743,7 @@ matrix_mx_puppet_twitter_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -784,7 +784,7 @@ matrix_mx_puppet_instagram_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -822,7 +822,7 @@ matrix_mx_puppet_discord_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -860,7 +860,7 @@ matrix_mx_puppet_steam_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -898,7 +898,7 @@ matrix_mx_puppet_groupme_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -934,9 +934,9 @@ matrix_bot_matrix_reminder_bot_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -997,7 +997,7 @@ matrix_bot_go_neb_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -1026,7 +1026,7 @@ matrix_bot_mjolnir_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -1060,10 +1060,9 @@ matrix_corporal_systemd_required_services_list: |
{{ {{
(['docker.service']) (['docker.service'])
+ +
(['matrix-synapse.service']) (['matrix-' + matrix_homeserver_implementation + '.service'])
}} }}
# This goes to Synapse's vhost
matrix_corporal_matrix_homeserver_api_endpoint: "{{ matrix_homeserver_container_url }}" matrix_corporal_matrix_homeserver_api_endpoint: "{{ matrix_homeserver_container_url }}"
matrix_corporal_matrix_auth_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret }}" matrix_corporal_matrix_auth_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret }}"
@ -1141,9 +1140,9 @@ matrix_dimension_systemd_required_services_list: |
{{ {{
['docker.service'] ['docker.service']
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-synapse.service'] if matrix_synapse_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
}} }}
@ -1330,7 +1329,7 @@ matrix_ma1sd_systemd_required_services_list: |
matrix_ma1sd_systemd_wanted_services_list: | matrix_ma1sd_systemd_wanted_services_list: |
{{ {{
(['matrix-corporal.service'] if matrix_corporal_enabled else ['matrix-synapse.service']) (['matrix-corporal.service'] if matrix_corporal_enabled else ['matrix-' + matrix_homeserver_implementation + '.service'])
+ +
(['matrix-postgres.service'] if matrix_postgres_enabled else []) (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+ +
@ -1454,7 +1453,7 @@ matrix_nginx_proxy_proxy_synapse_workers_enabled_list: "{{ matrix_synapse_worker
matrix_nginx_proxy_systemd_wanted_services_list: | matrix_nginx_proxy_systemd_wanted_services_list: |
{{ {{
(['matrix-synapse.service'] if matrix_synapse_enabled else []) ['matrix-' + matrix_homeserver_implementation + '.service']
+ +
(['matrix-corporal.service'] if matrix_corporal_enabled else []) (['matrix-corporal.service'] if matrix_corporal_enabled else [])
+ +