From bdd184242cbeb7070a2bb1ec89fd787e3a3ee119 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 17 Mar 2025 19:09:40 +0200 Subject: [PATCH] Use boolean values for `matrix_user_verification_service_uvs_disable_ip_blacklist` --- group_vars/matrix_servers | 2 +- .../matrix-user-verification-service/templates/.env.j2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index d1a51123b..8bf0e13de 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -6089,7 +6089,7 @@ matrix_user_verification_service_container_url: "http://{{ matrix_user_verifica matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_addons_homeserver_client_api_url }}" # We connect via the container network (private IPs), so we need to disable IP checks -matrix_user_verification_service_uvs_disable_ip_blacklist: "{{'true' if matrix_synapse_enabled else 'false'}}" +matrix_user_verification_service_uvs_disable_ip_blacklist: "{{ matrix_synapse_enabled }}" matrix_user_verification_service_uvs_auth_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'uvs.auth.token', rounds=655555) | to_uuid }}" diff --git a/roles/custom/matrix-user-verification-service/templates/.env.j2 b/roles/custom/matrix-user-verification-service/templates/.env.j2 index e07870e02..6871f2614 100644 --- a/roles/custom/matrix-user-verification-service/templates/.env.j2 +++ b/roles/custom/matrix-user-verification-service/templates/.env.j2 @@ -6,11 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later UVS_ACCESS_TOKEN={{ matrix_user_verification_service_uvs_access_token }} UVS_HOMESERVER_URL={{ matrix_user_verification_service_uvs_homeserver_url }} -UVS_DISABLE_IP_BLACKLIST={{ matrix_user_verification_service_uvs_disable_ip_blacklist }} +UVS_DISABLE_IP_BLACKLIST={{ matrix_user_verification_service_uvs_disable_ip_blacklist | to_json }} UVS_LOG_LEVEL={{ matrix_user_verification_service_uvs_log_level }} {% if matrix_user_verification_service_uvs_require_auth | bool %} - UVS_AUTH_TOKEN={{ matrix_user_verification_service_uvs_auth_token }} +UVS_AUTH_TOKEN={{ matrix_user_verification_service_uvs_auth_token }} {% endif %} {% if matrix_user_verification_service_uvs_pin_openid_verify_server_name | bool %} - UVS_OPENID_VERIFY_SERVER_NAME={{ matrix_user_verification_service_uvs_openid_verify_server_name }} +UVS_OPENID_VERIFY_SERVER_NAME={{ matrix_user_verification_service_uvs_openid_verify_server_name }} {% endif %}