From f71080a72ae4c4ed9c98367e80393693d12bebfc Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 19 May 2026 09:05:00 +0300 Subject: [PATCH] Remove useless group_vars/matrix_servers overrides These variables were being assigned in group_vars/matrix_servers to values byte-identical (or functionally identical) to what the respective role's defaults/main.yml already provides. Beyond just being noise, such redundant overrides cause drift over time. When a role's default is later updated to something saner or better (for example, switched from a hardcoded value to a derivation from another variable), the matching line in group_vars/matrix_servers stays frozen at the old value and silently defeats the improvement, because group_vars beats role defaults in Ansible's precedence order. The maubot management hostname fix in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/5248 is an example of this: the role default had been improved to derive from matrix_bot_maubot_hostname, but the stale group_vars override held it back to matrix_server_fqn_matrix. Removing these overrides lets the role defaults do their job. Closes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/5248 Co-Authored-By: Claude Opus 4.7 (1M context) --- group_vars/matrix_servers | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 753a56172..6e8a35ec8 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -2178,7 +2178,6 @@ matrix_mautrix_wsproxy_systemd_required_services_list_default: | ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_mautrix_wsproxy_syncproxy_database_hostname == postgres_connection_hostname) else []) }} -matrix_mautrix_wsproxy_homeserver_domain: "{{ matrix_domain }}" matrix_mautrix_wsproxy_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}" matrix_mautrix_wsproxy_hostname: "wsproxy.{{ matrix_mautrix_wsproxy_homeserver_domain }}" @@ -2491,7 +2490,6 @@ matrix_hookshot_container_labels_metrics_middleware_basic_auth_enabled: "{{ matr matrix_hookshot_container_labels_metrics_middleware_basic_auth_users: "{{ matrix_metrics_exposure_http_basic_auth_users }}" matrix_hookshot_public_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" -matrix_hookshot_public_hostname: "{{ matrix_server_fqn_matrix }}" ###################################################################### # @@ -3539,8 +3537,6 @@ matrix_rageshake_hostname: "{{ matrix_server_fqn_rageshake }}" matrix_rageshake_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_rageshake_container_image_registry_prefix_upstream_default }}" -matrix_rageshake_container_network: matrix-rageshake - matrix_rageshake_container_additional_networks: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else [] }}" matrix_rageshake_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '9110') if matrix_playbook_service_host_bind_interface_prefix else '' }}" @@ -4463,12 +4459,6 @@ matrix_client_element_container_labels_traefik_compression_middleware_name: "{{ matrix_client_element_default_hs_url: "{{ matrix_homeserver_url }}" matrix_client_element_default_is_url: "{{ matrix_identity_server_url }}" -# Use Scalar by default -matrix_client_element_integrations_ui_url: "https://scalar.vector.im/" -matrix_client_element_integrations_rest_url: "https://scalar.vector.im/api" -matrix_client_element_integrations_widgets_urls: "{{ ['https://scalar.vector.im/api'] }}" -matrix_client_element_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html" - matrix_client_element_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}" matrix_client_element_registration_enabled: "{{ matrix_synapse_enable_registration }}" @@ -4698,12 +4688,6 @@ matrix_client_schildichat_container_labels_traefik_tls_certResolver: "{{ traefik matrix_client_schildichat_default_hs_url: "{{ matrix_homeserver_url }}" matrix_client_schildichat_default_is_url: "{{ matrix_identity_server_url }}" -# Use Scalar by default -matrix_client_schildichat_integrations_ui_url: "https://scalar.vector.im/" -matrix_client_schildichat_integrations_rest_url: "https://scalar.vector.im/api" -matrix_client_schildichat_integrations_widgets_urls: "{{ ['https://scalar.vector.im/api'] }}" -matrix_client_schildichat_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html" - matrix_client_schildichat_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}" matrix_client_schildichat_registration_enabled: "{{ matrix_synapse_enable_registration }}" @@ -4827,7 +4811,6 @@ matrix_synapse_container_labels_internal_client_synapse_admin_api_traefik_entryp matrix_synapse_container_labels_public_federation_api_traefik_hostname: "{{ matrix_server_fqn_matrix_federation }}" matrix_synapse_container_labels_public_federation_api_traefik_entrypoints: "{{ matrix_federation_traefik_entrypoint_name }}" matrix_synapse_container_labels_public_federation_api_traefik_tls: "{{ matrix_federation_traefik_entrypoint_tls }}" -matrix_synapse_container_labels_public_federation_api_traefik_tls_certResolver: "{{ matrix_synapse_container_labels_traefik_tls_certResolver }}" # noqa var-naming matrix_synapse_container_labels_public_metrics_middleware_basic_auth_enabled: "{{ matrix_metrics_exposure_http_basic_auth_enabled }}" matrix_synapse_container_labels_public_metrics_middleware_basic_auth_users: "{{ matrix_metrics_exposure_http_basic_auth_users }}" @@ -4871,7 +4854,6 @@ matrix_synapse_metrics_proxying_path_prefix: "{{ matrix_metrics_exposure_path_pr matrix_synapse_email_enabled: "{{ exim_relay_enabled }}" matrix_synapse_email_smtp_host: "{{ exim_relay_identifier }}" matrix_synapse_email_smtp_port: 8025 -matrix_synapse_email_smtp_require_transport_security: false matrix_synapse_email_notif_from: "Matrix <{{ exim_relay_sender_address }}>" matrix_synapse_turn_uris: "{{ coturn_turn_uris if coturn_enabled else [] }}" @@ -5225,7 +5207,6 @@ matrix_synapse_usage_exporter_container_network: "{{ matrix_monitoring_container matrix_synapse_usage_exporter_container_additional_networks: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else [] }}" -matrix_synapse_usage_exporter_container_labels_traefik_enabled: "{{ matrix_synapse_usage_exporter_proxying_enabled }}" matrix_synapse_usage_exporter_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" matrix_synapse_usage_exporter_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" matrix_synapse_usage_exporter_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" @@ -6417,7 +6398,6 @@ matrix_livekit_jwt_service_enabled: "{{ matrix_rtc_enabled and livekit_server_en matrix_livekit_jwt_service_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" matrix_livekit_jwt_service_hostname: "{{ matrix_server_fqn_matrix }}" -matrix_livekit_jwt_service_path_prefix: "/livekit-jwt-service" matrix_livekit_jwt_service_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"