From f1dc69afe6dbb2f03fccb1cc26e49b8bcd3e1482 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 31 Jan 2022 17:00:10 +0100
Subject: [PATCH] Update to 2022-01-31 17:00

---
 roles/matrix_element/defaults/main.yml |  4 ++--
 roles/penpot/defaults/main.yml         |  2 +-
 roles/penpot/tasks/install.yml         | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml
index 5e86911..31dc4f5 100644
--- a/roles/matrix_element/defaults/main.yml
+++ b/roles/matrix_element/defaults/main.yml
@@ -5,9 +5,9 @@
 element_id: element
 
 # Version to deploy, and expected sha1
-element_version: 1.9.9
+element_version: 1.10.0
 # sha1sum of the tar.gz
-element_archive_sha1: 65aae8a31aa26e81474e6bdf07be2807045ce6d5
+element_archive_sha1: 229bbb253fc0e3a34b2749432de062f0089ed856
 
 # Where to install element
 element_root_dir: /opt/matrix/element
diff --git a/roles/penpot/defaults/main.yml b/roles/penpot/defaults/main.yml
index 4c5374c..0b6b65f 100644
--- a/roles/penpot/defaults/main.yml
+++ b/roles/penpot/defaults/main.yml
@@ -65,7 +65,7 @@ penpot_ldap_search_filter: "{{ ad_auth | ternary('(&(sAMAccountName=:username)(o
 # If auth is needed, set penpot_ldap_bind_dn and penpot_ldap_bind_pass
 # penpot_ldap_bin_dn: CN=Penpot, OU=Apps, DC=example, DC=org
 # penpot_ldap_bind_pass: S3cr3t.
-penpot_ldap_attr_username: "{{ ad_auth | default(False) | ternary('sAMAccountName', 'uid') }}"
+penpot_ldap_attr_username: "{{ ad_auth | default(False) | ternary('userPrincipalName', 'uid') }}"
 penpot_ldap_attr_email: mail
 penpot_ldap_attr_fullname: cn
 penpot_ldap_attr_photo: jpegPhoto
diff --git a/roles/penpot/tasks/install.yml b/roles/penpot/tasks/install.yml
index f84eec8..bace202 100644
--- a/roles/penpot/tasks/install.yml
+++ b/roles/penpot/tasks/install.yml
@@ -11,6 +11,22 @@
     - sfnt2woff
   tags: penpot
 
+- when: system_proxy is defined and system_proxy != ''
+  block:
+
+    - name: Create maven configuration dir
+      file: path={{ penpot_root_dir }}/.m2 state=directory owner={{ penpot_user }} group={{ penpot_user }}
+
+    - name: Deploy maven configuration
+      template: src=../maven/templates/maven.xml.j2 dest={{ penpot_root_dir }}/.m2/settings.xml owner={{ penpot_user }} group={{ penpot_user }}
+
+  tags: penpot
+
+- when: system_proxy is not defined or system_proxy == ''
+  name: Remove maven proxy config
+  file: path={{ penpot_root_dir }}/.m2/settings.xml state=absent
+  tags: penpot
+
 - when: penpot_install_mode != 'none'
   block: