From f8da8deb7d88d86d31d5f7932b12efecbbbca0f4 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 23 Mar 2021 11:00:06 +0100
Subject: [PATCH] Update to 2021-03-23 11:00

---
 roles/jitsi/defaults/main.yml             | 2 +-
 roles/jitsi_videobridge/tasks/install.yml | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/roles/jitsi/defaults/main.yml b/roles/jitsi/defaults/main.yml
index 75d0921..ae33be8 100644
--- a/roles/jitsi/defaults/main.yml
+++ b/roles/jitsi/defaults/main.yml
@@ -230,7 +230,7 @@ jitsi_meet_custom_lang:
 
 # If jitsi_auth is ldap
 # We inherit values from prosody if available, or we try to get values from ad_auth or ldap_auth
-jitsi_ldap_base: "{{ prosody_ldap_base | default(ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base + ',' + ldap_base)) }}"
+jitsi_ldap_base: "{{ prosody_ldap_base | default(ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base | default('ou=Users') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.','dc=')))) }}"
 jitsi_ldap_servers: "{{ prosody_ldap_server | default(ad_ldap_servers | default([ad_auth | default(False) | ternary(ad_realm | default(samba_realm) | default(ansible_domain) | lower, ldap_uri | default('ldap://' + ansible_domain) | urlsplit('hostname'))]))}}"
 jitsi_ldap_bind_dn: "{{ prosody_ldap_bind_dn | default(None) }}"
 jitsi_ldap_bind_pass: "{{ prosody_ldap_bind_pass | default(None) }}"
diff --git a/roles/jitsi_videobridge/tasks/install.yml b/roles/jitsi_videobridge/tasks/install.yml
index fc5d5b9..18c02a0 100644
--- a/roles/jitsi_videobridge/tasks/install.yml
+++ b/roles/jitsi_videobridge/tasks/install.yml
@@ -7,11 +7,6 @@
       - git
   tags: jitsi
 
-  # Needed if you use a proxy, as maven does not honor the standard $http_proxy / $https_proxy env
-- name: Configure maven for {{ jitsi_user }}
-  template: src=../jitsi/templates/maven.xml.j2 dest={{ jitsi_root_dir }}/.m2/settings.xml
-  tags: jitsi
-
   # If the repo changed since the last run, we rebuild and restart the bridge
 - name: Clone videobridge repo
   git: