From 16aca60368b5ff2fa22497fea9780401ad522c8a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 2 Nov 2021 18:00:08 +0100
Subject: [PATCH] Update to 2021-11-02 18:00

---
 roles/matrix_element/templates/config.json.j2     | 13 +++++++++++--
 roles/matrix_synapse/defaults/main.yml            |  2 +-
 roles/matrix_synapse/templates/homeserver.yaml.j2 |  3 +++
 roles/squid/files/acl/software_windows.domains    |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/roles/matrix_element/templates/config.json.j2 b/roles/matrix_element/templates/config.json.j2
index 4e7ccce..cacc4ea 100644
--- a/roles/matrix_element/templates/config.json.j2
+++ b/roles/matrix_element/templates/config.json.j2
@@ -1,7 +1,7 @@
 {
     "default_hs_url": "{{ element_default_home_server | default('https://' + synapse_server_name) | default('https://matrix.org') }}",
     "default_is_url": "{{ element_default_identity_server }}",
-    "brand": "Riot",
+    "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
@@ -12,7 +12,7 @@
         "https://scalar-staging.element.im/scalar/api"
     ],
     "bug_report_endpoint_url": "https://element.im/bugreports/submit",
-    "enableLabs": true,
+    "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"
@@ -26,5 +26,14 @@
         "preferredDomain": "{{ element_jitsi_server }}"
     },
 {% endif %}
+   "settingDefaults": {
+      "UIFeature.feedback": false,
+      "UIFeature.thirdPartyId": false,
+{% if synapse_auth is defined and 'internal' not in synapse_auth and synapse_auth != 'internal' %}
+      "UIFeature.passwordReset": false,
+      "UIFeature.deactivate": false,
+{% endif %}
+      "UIFeature.registration": {{ (synapse_enable_registration | default(False)) | ternary('true', 'false') }}
+   },
    "happyJson": true
 }
diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml
index 0330cec..eed6a83 100644
--- a/roles/matrix_synapse/defaults/main.yml
+++ b/roles/matrix_synapse/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Synapse version to deploy
-synapse_version: 1.45.0
+synapse_version: 1.46.0
 
 # Should ansible handle Synapse upgrades ? If false, only initial install will be done
 synapse_manage_upgrade: True
diff --git a/roles/matrix_synapse/templates/homeserver.yaml.j2 b/roles/matrix_synapse/templates/homeserver.yaml.j2
index 7158ade..bf7e878 100644
--- a/roles/matrix_synapse/templates/homeserver.yaml.j2
+++ b/roles/matrix_synapse/templates/homeserver.yaml.j2
@@ -208,4 +208,7 @@ alias_creation_rules:
       alias: '*'
       action: allow
 
+server_notices:
+   system_mxid_localpart: server
+   system_mxid_display_name: "Notification bot"
 ...
diff --git a/roles/squid/files/acl/software_windows.domains b/roles/squid/files/acl/software_windows.domains
index b10013a..bac79ac 100644
--- a/roles/squid/files/acl/software_windows.domains
+++ b/roles/squid/files/acl/software_windows.domains
@@ -21,6 +21,7 @@ dl.delivery.mp.microsoft.com
 dmd.metaservices.microsoft.com
 activation-v2.sls.microsoft.com
 download.visualstudio.microsoft.com
+activation.sls.microsoft.com
 
 # comon CRL / OCSP
 crl.microsoft.com