From 812b395aa9d31143a1d759f77ac181a0fff6c18f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 3 Apr 2023 08:59:43 +0300 Subject: [PATCH] Remove various systemd services from matrix-nginx-proxy Wanted list when not proxied via nginx If Traefik is used, these are not Wanted services. --- group_vars/matrix_servers | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 39895152..95c614c0 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -2682,33 +2682,31 @@ matrix_nginx_proxy_systemd_wanted_services_list: | + (['matrix-ma1sd.service'] if matrix_ma1sd_enabled else []) + - (['matrix-client-cinny.service'] if matrix_client_cinny_enabled else []) + (['matrix-client-cinny.service'] if matrix_client_cinny_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-bot-buscarron.service'] if matrix_bot_buscarron_enabled else []) + (['matrix-bot-buscarron.service'] if matrix_bot_buscarron_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-client-element.service'] if matrix_client_element_enabled else []) + (['matrix-client-element.service'] if matrix_client_element_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-client-hydrogen.service'] if matrix_client_hydrogen_enabled else []) + (['matrix-client-hydrogen.service'] if matrix_client_hydrogen_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - ([(grafana_identifier + '.service')] if grafana_enabled else []) + ([(grafana_identifier + '.service')] if grafana_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-dimension.service'] if matrix_dimension_enabled else []) + (['matrix-dimension.service'] if matrix_dimension_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-rageshake.service'] if matrix_rageshake_enabled else []) + (['matrix-rageshake.service'] if matrix_rageshake_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-sygnal.service'] if matrix_sygnal_enabled else []) + (['matrix-sygnal.service'] if matrix_sygnal_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - ([(ntfy_identifier + '.service')] if ntfy_enabled else []) + ([(ntfy_identifier + '.service')] if ntfy_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - ([(jitsi_identifier + '-web.service')] if jitsi_enabled else []) + ([(jitsi_identifier + '-web.service')] if jitsi_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-sliding-sync-proxy.service'] if matrix_sliding_sync_enabled else []) + (['matrix-bot-go-neb.service'] if matrix_bot_go_neb_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - (['matrix-bot-go-neb.service'] if matrix_bot_go_neb_enabled else []) + ([etherpad_identifier + '.service'] if etherpad_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) + - ([etherpad_identifier + '.service'] if etherpad_enabled else []) - + - (['matrix-hookshot.service'] if matrix_hookshot_enabled else []) + (['matrix-hookshot.service'] if matrix_hookshot_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] else []) }} matrix_ssl_domains_to_obtain_certificates_for: |