From 14d57bb7a6d55e2f2af20f40b31fc5edfd70522c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 7 Jan 2024 08:58:06 +0200 Subject: [PATCH] Reorganize mautrix-facebook group vars for consistency --- group_vars/matrix_servers | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 8ba2c309f..fa2f39fec 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -882,8 +882,17 @@ matrix_mautrix_slack_database_password: "{{ '%s' | format(matrix_homeserver_gene # We don't enable bridges by default. matrix_mautrix_facebook_enabled: false +matrix_mautrix_facebook_systemd_required_services_list_auto: | + {{ + matrix_addons_homeserver_systemd_services_list + + + ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and matrix_mautrix_facebook_database_hostname == devture_postgres_connection_hostname else []) + }} + matrix_mautrix_facebook_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" +matrix_mautrix_facebook_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '9008') if matrix_playbook_service_host_bind_interface_prefix else '' }}" + matrix_mautrix_facebook_container_network: "{{ matrix_addons_container_network }}" matrix_mautrix_facebook_container_additional_networks_auto: |- @@ -897,14 +906,6 @@ matrix_mautrix_facebook_container_additional_networks_auto: |- ) | unique }} -matrix_mautrix_facebook_systemd_required_services_list_auto: | - {{ - matrix_addons_homeserver_systemd_services_list - + - ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and matrix_mautrix_facebook_database_hostname == devture_postgres_connection_hostname else []) - }} - - matrix_mautrix_facebook_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" matrix_mautrix_facebook_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" matrix_mautrix_facebook_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" @@ -923,8 +924,6 @@ matrix_mautrix_facebook_appservice_public_enabled: true matrix_mautrix_facebook_appservice_public_hostname: "{{ matrix_server_fqn_matrix }}" matrix_mautrix_facebook_appservice_public_prefix: "/{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'facebook', rounds=655555) | to_uuid }}" -matrix_mautrix_facebook_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '9008') if matrix_playbook_service_host_bind_interface_prefix else '' }}" - matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}" matrix_mautrix_facebook_bridge_presence: "{{ matrix_synapse_presence_enabled if matrix_synapse_enabled else true }}"