From 1d99f17b4a32c724dd7ecf8a1cd36f0b7361f383 Mon Sep 17 00:00:00 2001
From: Paul N <92150859+stift-n2@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:23:11 +0100
Subject: [PATCH] Disable matrix-user-verification-service in group_vars and
 update docs accordingly.

---
 docs/configuring-playbook-jitsi.md                     | 1 +
 docs/configuring-playbook-user-verification-service.md | 2 +-
 group_vars/matrix_servers                              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/configuring-playbook-jitsi.md b/docs/configuring-playbook-jitsi.md
index f51f8fc1..6c787bdb 100644
--- a/docs/configuring-playbook-jitsi.md
+++ b/docs/configuring-playbook-jitsi.md
@@ -79,6 +79,7 @@ To enable set this configuration at host level:
 ```yaml
 matrix_jitsi_enable_auth: true
 matrix_jitsi_auth_type: "matrix"
+matrix_user_verification_service_enabled: true
 ```
 
 For more information see also [https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification](https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification).
diff --git a/docs/configuring-playbook-user-verification-service.md b/docs/configuring-playbook-user-verification-service.md
index 82e4e84e..1990e891 100644
--- a/docs/configuring-playbook-user-verification-service.md
+++ b/docs/configuring-playbook-user-verification-service.md
@@ -30,7 +30,7 @@ In order to use UVS, an admin token for the configured homeserver must be suppli
 
 ## Enable
 
-[Matrix User Verification Service](https://github.com/matrix-org/matrix-user-verification-service) installation is disabled by default unless required by Jitsi (see group_vars/matrix_servers). 
+[Matrix User Verification Service](https://github.com/matrix-org/matrix-user-verification-service) installation is disabled by default.
 You can enable it in your configuration file (`inventory/host_vars/matrix.<your-domain>/vars.yml`):
 
 ```yaml
diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 8cd9baa9..1bd1c1d3 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3188,7 +3188,7 @@ matrix_user_creator_users_auto: |
 matrix_user_verification_service_docker_image: "{{ matrix_user_verification_service_docker_image_name_prefix }}matrixdotorg/matrix-user-verification-service@sha256:d2aabc984dd69d258c91900c36928972d7aaef19d776caa3cd6a0fbc0e307270"
 
 # enable if jitsi is managed by this playbook and requires JWT auth
-matrix_user_verification_service_enabled: "{{ (matrix_jitsi_enabled | bool and matrix_jitsi_enable_auth | bool and matrix_jitsi_auth_type == 'matrix') }}"
+matrix_user_verification_service_enabled: false
 matrix_user_verification_service_systemd_required_services_list: |
       {{
         ['docker.service']