From 856a328e96c679bc7d51760d00708d921a08cb17 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 24 Jul 2023 08:44:33 +0300
Subject: [PATCH 01/58] Upgrade prometheus-postgres-exporter (v0.13.1-0 ->
 v0.13.2-0)

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index bac5fea32..91912c901 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -47,7 +47,7 @@
 - src: git+https://gitlab.com/etke.cc/roles/prometheus_node_exporter.git
   version: v1.6.0-0
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-postgres-exporter.git
-  version: v0.13.1-0
+  version: v0.13.2-0
   name: prometheus_postgres_exporter
 - src: git+https://gitlab.com/etke.cc/roles/redis.git
   version: v7.0.10-0

From 14f7eed9324b58f4acb264f0cab3b15bfd10ac07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= <julian-samuel@gebuehr.net>
Date: Mon, 24 Jul 2023 12:57:06 +0200
Subject: [PATCH 02/58] Update matrix-registration-bot, improve authentication
 config (#2723)

* Adjust to new mrb docker versioning

* Stabilze authentication

* fix lint

* Move & document mrb password usage

* Add clean cache role

* Document clean cache

* Fix lint

* Update CHANGELOG.md

* Automate access tokens

* Improve changelog

* Make use of mrb's function to fetch API tokens

* Adjust changelog

* Use ansible.builtin.file to clear directory

* Fix typo

---------

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
---
 CHANGELOG.md                                  | 11 +++++
 ...ng-playbook-bot-matrix-registration-bot.md | 47 +++++++++----------
 group_vars/matrix_servers                     |  6 +++
 .../defaults/main.yml                         | 22 +++++----
 .../tasks/clean_cache.yml                     | 12 +++++
 .../tasks/main.yml                            |  6 +++
 .../tasks/setup_install.yml                   |  2 +-
 .../tasks/validate_config.yml                 |  9 +++-
 .../templates/config/config.yml.j2            |  6 ++-
 9 files changed, 83 insertions(+), 38 deletions(-)
 create mode 100644 roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 950e38e4e..3db319afe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 2023-07-24
+
+## matrix-registration-bot usage changed
+
+[matrix-registration-bot](docs/configuring-playbook-bot-matrix-registration-bot.md) got some updates and now supports password-only-based login. Therefore the bot now doesn't need any manual configuration except setting a password in your `vars.yml`. The bot will be registered as admin and access tokens will be obtained automatically by the bot.
+
+**For existing users** You need to set `matrix_bot_matrix_registration_bot_bot_password` if you previously only used `matrix_bot_matrix_registration_bot_bot_access_token`. Please also remove the following deprecated settings
+
+* `matrix_bot_matrix_registration_bot_bot_access_token`
+* `matrix_bot_matrix_registration_bot_api_token`
+
 # 2023-07-21
 
 ## mautrix-gmessages support
diff --git a/docs/configuring-playbook-bot-matrix-registration-bot.md b/docs/configuring-playbook-bot-matrix-registration-bot.md
index b1e3fdc6c..f0bffc85c 100644
--- a/docs/configuring-playbook-bot-matrix-registration-bot.md
+++ b/docs/configuring-playbook-bot-matrix-registration-bot.md
@@ -2,40 +2,30 @@
 
 The playbook can install and configure [matrix-registration-bot](https://github.com/moan0s/matrix-registration-bot) for you.
 
-The bot allows you to easily **create and manage registration tokens**. It can be used for an invitation-based server,
-where you invite someone by sending them a registration token. They can register as normal but have to provide a valid
-registration token in a final step  of the registration.
+The bot allows you to easily **create and manage registration tokens** aka. invitation codes.
+It can be used for an invitation-based server,
+where you invite someone by sending them a registration token (loook like this: `rbalQ0zkaDSRQCOp`). They can register as normal but have to provide a valid registration token in a final step of the registration.
 
 See the project's [documentation](https://github.com/moan0s/matrix-registration-bot#supported-commands) to learn what it
 does and why it might be useful to you.
 
 
-## Registering the bot user
+## Configuration
 
-By default, the playbook will set use the bot with a username like this: `@bot.matrix-registration-bot:DOMAIN`.
+To enable the bot, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file:
 
-(to use a different username, adjust the `matrix_bot_matrix_registration_bot_matrix_user_id_localpart` variable).
-
-For [other bots supported by the playbook](configuring-playbook.md#bots), Matrix bot user accounts are created and put to use automatically. For `matrix-registration-bot`, however, this is not the case - you **need to register the bot user manually** before setting up the bot. You can use the playbook to [register a new user](registering-users.md):
-
-```
-ansible-playbook -i inventory/hosts setup.yml --extra-vars='username=bot.matrix-registration-bot password=PASSWORD_FOR_THE_BOT admin=yes' --tags=register-user
-```
-
-Choose a strong password for the bot. You can generate a good password with a command like this: `pwgen -s 64 1`.
-
-## Obtaining an admin access token
-
-In order to use the bot you need to add an admin user's access token token to the configuration. Refer to the documentation on [how to obtain an access token](obtaining-access-tokens.md).
-
-## Adjusting the playbook configuration
-
-Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file:
+For `matrix_bot_matrix_registration_bot_api_token`you need an access token with the permission to access the admin api. Access to the API is needed for all restricted actions of the bot (list, create etc..). Refer to the documentation on [how to obtain an access token](obtaining-access-tokens.md).
 
 ```yaml
 matrix_bot_matrix_registration_bot_enabled: true
-# Token obtained via logging into the bot account (see above)
-matrix_bot_matrix_registration_bot_bot_access_token: "syt_bW9hbm9z_XXXXXXXXXXXXXr_2kuzbE"
+
+#By default, the playbook will set use the bot with a username like 
+## this: `@bot.matrix-registration-bot:DOMAIN`.
+# To use a different username, uncomment & adjust the variable.
+# matrix_bot_matrix_registration_bot_matrix_user_id_localpart: bot.matrix-registration-bot
+
+# Generate a strong password here. Consider generating it with `pwgen -s 64 1`
+matrix_bot_matrix_registration_bot_password: PASSWORD_FOR_THE_BOT
 
 # Enables registration
 matrix_synapse_enable_registration: true
@@ -44,6 +34,7 @@ matrix_synapse_enable_registration: true
 matrix_synapse_registration_requires_token: true
 ```
 
+The bot account will be automatically created.
 
 ## Installing
 
@@ -56,10 +47,16 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
 
 ## Usage
 
-To use the bot, create a **non-encrypted** room and invite `@bot.matrix-registration-bot:DOMAIN` (where `DOMAIN` is your base domain, not the `matrix.` domain).
+To use the bot, message `@bot.matrix-registration-bot:DOMAIN` (where `DOMAIN` is your base domain, not the `matrix.` domain).
 
 In this room send `help` and the bot will reply with all options.
 
 You can also refer to the upstream [Usage documentation](https://github.com/moan0s/matrix-registration-bot#supported-commands).
 If you have any questions, or if you need help setting it up, read the [troublshooting guide](https://github.com/moan0s/matrix-registration-bot/blob/main/docs/troubleshooting.md)
 or join [#matrix-registration-bot:hyteck.de](https://matrix.to/#/#matrix-registration-bot:hyteck.de).
+
+To clean the cache (session&encryption data) after you changed the bot's username, changed the login methon form access_token to password etc.. you can use
+
+```bash
+just run-tags bot-matrix-registration-bot-clean-cache
+```
diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 0a30f217b..bf9928d0e 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4123,6 +4123,12 @@ matrix_conduit_systemd_required_services_list: |
 
 matrix_user_creator_users_auto: |
   {{
+    ([{
+      'username': matrix_bot_matrix_registration_bot_matrix_user_id_localpart,
+      'initial_password': matrix_bot_matrix_registration_bot_bot_password,
+      'initial_type': 'admin',
+    }] if matrix_bot_matrix_registration_bot_enabled else [])
+    +
     ([{
       'username': matrix_bot_matrix_reminder_bot_matrix_user_id_localpart,
       'initial_password': matrix_bot_matrix_reminder_bot_matrix_user_password,
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml b/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml
index d8e52b719..41143566a 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml
@@ -8,8 +8,10 @@ matrix_bot_matrix_registration_bot_docker_repo: "https://github.com/moan0s/matri
 matrix_bot_matrix_registration_bot_docker_repo_version: "{{ matrix_bot_matrix_registration_bot_version if matrix_bot_matrix_registration_bot_version != 'latest' else 'main' }}"
 matrix_bot_matrix_registration_bot_docker_src_files_path: "{{ matrix_bot_matrix_registration_bot_base_path }}/docker-src"
 
-matrix_bot_matrix_registration_bot_version: latest
-matrix_bot_matrix_registration_bot_docker_image: "{{ matrix_container_global_registry_prefix }}moanos/matrix-registration-bot:{{ matrix_bot_matrix_registration_bot_version }}"
+matrix_bot_matrix_registration_bot_version: 1.3.0
+matrix_bot_matrix_registration_bot_docker_iteration: 0
+matrix_bot_matrix_registration_bot_docker_tag: "{{ matrix_bot_matrix_registration_bot_version }}-{{ matrix_bot_matrix_registration_bot_docker_iteration}}"
+matrix_bot_matrix_registration_bot_docker_image: "{{ matrix_container_global_registry_prefix }}moanos/matrix-registration-bot:{{ matrix_bot_matrix_registration_bot_docker_tag }}"
 matrix_bot_matrix_registration_bot_docker_image_force_pull: "{{ matrix_bot_matrix_registration_bot_docker_image.endswith(':latest') }}"
 
 matrix_bot_matrix_registration_bot_base_path: "{{ matrix_base_data_path }}/matrix-registration-bot"
@@ -19,15 +21,15 @@ matrix_bot_matrix_registration_bot_data_path: "{{ matrix_bot_matrix_registration
 matrix_bot_matrix_registration_bot_bot_server: "https://{{ matrix_server_fqn_matrix }}"
 matrix_bot_matrix_registration_bot_api_base_url: "https://{{ matrix_server_fqn_matrix }}"
 
-# The access token that the bot uses to communicate in Matrix chats
-# This does not necessarily need to be a privileged (admin) access token.
-matrix_bot_matrix_registration_bot_bot_access_token: ''
 
-# The access token that the bot uses to call the Matrix API for creating registration tokens.
-# This needs to be a privileged (admin) access token.
-# By default, we assume `matrix_bot_matrix_registration_bot_bot_access_token` is such a privileged token and we use it as is.
-# If necessary, you can define your own other access token here, which might even be for a different Matrix user.
-matrix_bot_matrix_registration_bot_api_token: "{{ matrix_bot_matrix_registration_bot_bot_access_token }}"
+# The bot's password (can also be used to login via a client like element)
+matrix_bot_matrix_registration_bot_bot_password: ''
+
+# Optional variable that only needs to be set if the bot account is not admin
+# Needs to be a valid access token of an admin account
+matrix_bot_matrix_registration_bot_api_token: ''
+
+matrix_bot_matrix_registration_bot_device_id: "matrix-docker-ansible-deploy"
 
 matrix_bot_matrix_registration_bot_logging_level: info
 matrix_bot_matrix_registration_environment_variables_extension: ''
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml
new file mode 100644
index 000000000..ae4433b8f
--- /dev/null
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml
@@ -0,0 +1,12 @@
+---
+
+- name: Delete cache files
+  ansible.builtin.file:
+    state: "{{ item }}"
+    path: "{{ matrix_bot_matrix_registration_bot_data_path }}"
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - absent
+    - directory
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml
index 83291fb6d..cd11c1d5d 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml
@@ -18,3 +18,9 @@
   block:
     - when: not matrix_bot_matrix_registration_bot_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+
+- tags:
+    - bot-matrix-registration-bot-clean-cache
+  block:
+    - when: matrix_bot_matrix_registration_bot_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/clean_cache.yml"
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
index 515cd9973..655f3d275 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
@@ -9,7 +9,7 @@
     group: "{{ matrix_user_groupname }}"
   with_items:
     - {path: "{{ matrix_bot_matrix_registration_bot_config_path }}", when: true}
-    - - {path: "{{ matrix_bot_matrix_registration_bot_data_path }}", when: true}
+    - {path: "{{ matrix_bot_matrix_registration_bot_data_path }}", when: true}
     - {path: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}", when: true}
   when: "item.when | bool"
 
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/validate_config.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/validate_config.yml
index 39e97cde2..b7a475639 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/validate_config.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/validate_config.yml
@@ -5,6 +5,13 @@
     msg: >-
       You need to define a required configuration setting (`{{ item }}`).
   when: "vars[item] == ''"
+  with_items:
+    - "matrix_bot_matrix_registration_bot_bot_password"
+
+- name: (Deprecation) Catch and report old settings
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which is deprecated - Please check the documentation on how to configure the matrix-registration-bot.
+  when: "item in vars"
   with_items:
     - "matrix_bot_matrix_registration_bot_bot_access_token"
-    - "matrix_bot_matrix_registration_bot_api_token"
diff --git a/roles/custom/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2 b/roles/custom/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2
index 756efb018..4a2242aa2 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2
+++ b/roles/custom/matrix-bot-matrix-registration-bot/templates/config/config.yml.j2
@@ -1,12 +1,16 @@
 bot:
   server: {{ matrix_bot_matrix_registration_bot_bot_server|to_json }}
   username: {{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart|to_json }}
-  access_token: {{ matrix_bot_matrix_registration_bot_bot_access_token|to_json }}
+  password: {{ matrix_bot_matrix_registration_bot_bot_password|to_json }}
+
 api:
   # API endpoint of the registration tokens
   base_url: {{ matrix_bot_matrix_registration_bot_api_base_url|to_json }}
   # Access token of an administrator on the server
+{% if matrix_bot_matrix_registration_bot_api_token | length > 0 %}
   token: {{ matrix_bot_matrix_registration_bot_api_token|to_json }}
+{% endif %}
+
 logging:
   level: {{ matrix_bot_matrix_registration_bot_logging_level|to_json }}
 

From 6666d230795fa1efb1cda13c7f868f282a1ed7fc Mon Sep 17 00:00:00 2001
From: ThellraAK <github.com@absurdlybored.com>
Date: Tue, 25 Jul 2023 00:04:02 -0800
Subject: [PATCH 03/58] Remove file logging, and add existing log level
 variable to config

---
 .../templates/config.yaml.j2                         | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-gmessages/templates/config.yaml.j2
index a17f6cd1e..6dc136bb4 100644
--- a/roles/custom/matrix-bridge-mautrix-gmessages/templates/config.yaml.j2
+++ b/roles/custom/matrix-bridge-mautrix-gmessages/templates/config.yaml.j2
@@ -286,13 +286,7 @@ bridge:
 
 # Logging config. See https://github.com/tulir/zeroconfig for details.
 logging:
-    min_level: debug
+    min_level: {{ matrix_mautrix_gmessages_logging_level }}
     writers:
-    - type: stdout
-      format: pretty-colored
-    - type: file
-      format: json
-      filename: ./logs/mautrix-gmessages.log
-      max_size: 100
-      max_backups: 10
-      compress: true
+        - type: stdout
+          format: pretty-colored

From 02de889656eee73bd457a2c39d9894d99001a2ac Mon Sep 17 00:00:00 2001
From: wuast94 <mihauku@googlemail.com>
Date: Tue, 25 Jul 2023 12:35:51 +0200
Subject: [PATCH 04/58] Fix Variable Registration bot

variable need to be named:
matrix_bot_matrix_registration_bot_bot_password

and not:
matrix_bot_matrix_registration_bot_password

Dont know if it need fixed in every rule or just change the docs
---
 docs/configuring-playbook-bot-matrix-registration-bot.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuring-playbook-bot-matrix-registration-bot.md b/docs/configuring-playbook-bot-matrix-registration-bot.md
index f0bffc85c..babfd2689 100644
--- a/docs/configuring-playbook-bot-matrix-registration-bot.md
+++ b/docs/configuring-playbook-bot-matrix-registration-bot.md
@@ -25,7 +25,7 @@ matrix_bot_matrix_registration_bot_enabled: true
 # matrix_bot_matrix_registration_bot_matrix_user_id_localpart: bot.matrix-registration-bot
 
 # Generate a strong password here. Consider generating it with `pwgen -s 64 1`
-matrix_bot_matrix_registration_bot_password: PASSWORD_FOR_THE_BOT
+matrix_bot_matrix_registration_bot_bot_password: PASSWORD_FOR_THE_BOT
 
 # Enables registration
 matrix_synapse_enable_registration: true

From 9703d1d1e5866e781168fd3255f26103b6de9020 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 25 Jul 2023 17:28:30 +0300
Subject: [PATCH 05/58] Upgrade Traefik (v2.10.3-0 -> v2.10.4-0)

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 91912c901..4f2fd7f80 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -26,7 +26,7 @@
 - src: git+https://github.com/devture/com.devture.ansible.role.timesync.git
   version: v1.0.0-0
 - src: git+https://github.com/devture/com.devture.ansible.role.traefik.git
-  version: v2.10.3-0
+  version: v2.10.4-0
 - src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git
   version: v2.8.1-0
 - src: git+https://gitlab.com/etke.cc/roles/etherpad.git

From 52ed1f7a0bb4adf39842965892bc78b1a5e88602 Mon Sep 17 00:00:00 2001
From: greentore <117551249+greentore@users.noreply.github.com>
Date: Tue, 25 Jul 2023 19:26:20 +0200
Subject: [PATCH 06/58] Update Element logo location

---
 roles/custom/matrix-client-element/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 9199a1d5a..123cbd32a 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -159,7 +159,7 @@ matrix_client_element_welcome_user_id: ~
 matrix_client_element_brand: "Element"
 
 # URL to Logo on welcome page
-matrix_client_element_welcome_logo: "welcome/images/logo.svg"
+matrix_client_element_welcome_logo: "themes/element/img/logos/element-logo.svg"
 
 # URL of link on welcome image
 matrix_client_element_welcome_logo_link: "https://element.io"

From ae2f67e15f5dd5a5fe88b64a837348d7fdd3cc7f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 26 Jul 2023 15:27:38 +0300
Subject: [PATCH 07/58] Make maubot communicate with the homeserver via the
 container network

Supersedes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2791
---
 roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2 b/roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2
index 49bbcb878..7750ec9a3 100644
--- a/roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2
+++ b/roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2
@@ -60,7 +60,7 @@ server:
 homeservers:
   {{  matrix_domain }}:
     # Client-server API URL
-        url: "https://{{ matrix_server_fqn_matrix }}"
+        url: {{ matrix_homeserver_container_url | to_json }}
     # registration_shared_secret from synapse config
     # You can leave this empty if you don't have access to the homeserver.
     # When this is empty, `mbc auth --register` won't work, but `mbc auth` (login) will.

From 08b433a8f7b02b5f3fc88dfc3b2f85f2feb1730c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 26 Jul 2023 19:50:18 +0300
Subject: [PATCH 08/58] Upgrade Grafana (v10.0.2-1 -> v10.0.3-0)

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 4f2fd7f80..1ef1f4da0 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -35,7 +35,7 @@
   version: 6.1.0
   name: geerlingguy.docker
 - src: git+https://gitlab.com/etke.cc/roles/grafana.git
-  version: v10.0.2-1
+  version: v10.0.3-0
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git
   version: v8615-2
   name: jitsi

From ba1d665bd993cc07f2b3a2a5077804cc3b5719ea Mon Sep 17 00:00:00 2001
From: Alexis Yushin <alexis@apexive.com>
Date: Thu, 27 Jul 2023 11:26:15 +0200
Subject: [PATCH 09/58] make smtp tls configurable / optional

---
 .gitignore                                                     | 1 +
 .../custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +-
 roles/custom/matrix-synapse/vars/main.yml                      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 421877392..6b56900a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /roles/**/files/scratchpad
 .DS_Store
 .python-version
+.idea/
 flake.lock
 
 # ignore roles pulled by ansible-galaxy
diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
index f42f6e309..e12bdb194 100644
--- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -2351,7 +2351,7 @@ email:
   # must present a certificate that is valid for 'smtp_host'. If this option
   # is set to false, TLS will not be used.
   #
-  #enable_tls: false
+  enable_tls: {{ matrix_synapse_email_smtp_enable_tls|to_json }}
 
   # notif_from defines the "From" address to use when sending emails.
   # It must be set if email sending is enabled.
diff --git a/roles/custom/matrix-synapse/vars/main.yml b/roles/custom/matrix-synapse/vars/main.yml
index 9ac7afeb7..a12b44017 100644
--- a/roles/custom/matrix-synapse/vars/main.yml
+++ b/roles/custom/matrix-synapse/vars/main.yml
@@ -5,6 +5,9 @@ matrix_synapse_federation_api_url_endpoint_public: "https://{{ matrix_server_fqn
 
 matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path | basename }}"
 
+# Optionally: `false` to fully disable tls on outbound smtp
+matrix_synapse_email_smtp_enable_tls: true
+
 # A Synapse generic worker can handle both federation and client-server API endpoints.
 # We wish to split these, as we normally serve federation separately and don't want them mixed up.
 #

From 92ea0480805a11c17fc9535332f0a9d2a27d8ac7 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 28 Jul 2023 08:40:43 +0300
Subject: [PATCH 10/58] Add some missing install-all/install-synapse tags to
 Synapse role

---
 .../matrix-synapse/tasks/ext/setup_install.yml     | 14 ++++++++++++++
 .../custom/matrix-synapse/tasks/setup_install.yml  |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/roles/custom/matrix-synapse/tasks/ext/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
index 0d8879392..4adb6566a 100644
--- a/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
@@ -4,6 +4,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_encryption_disabler_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/encryption-disabler/setup_install.yml"
@@ -12,6 +14,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_rest_auth_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup_install.yml"
@@ -20,6 +24,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_shared_secret_auth_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup_install.yml"
@@ -28,6 +34,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_ldap_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/ldap-auth/setup_install.yml"
@@ -36,6 +44,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/synapse-simple-antispam/setup_install.yml"
@@ -44,6 +54,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_spam_checker_mjolnir_antispam_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/mjolnir-antispam/setup_install.yml"
@@ -52,6 +64,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_synapse_s3_storage_provider_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/s3-storage-provider/validate_config.yml"
diff --git a/roles/custom/matrix-synapse/tasks/setup_install.yml b/roles/custom/matrix-synapse/tasks/setup_install.yml
index 378a0dee5..a2185da57 100644
--- a/roles/custom/matrix-synapse/tasks/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/setup_install.yml
@@ -26,6 +26,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_install.yml"
 
@@ -34,6 +36,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_workers_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/workers/setup_install.yml"
@@ -41,12 +45,16 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_install.yml"
 
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_s3_media_store_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/goofys/setup_install.yml"

From 621578399fe1e400b67140a8e5e18e226dfc3da4 Mon Sep 17 00:00:00 2001
From: "System user; root" <root@gentooo.tail29565.ts.net>
Date: Thu, 27 Jul 2023 23:00:59 -0800
Subject: [PATCH 11/58] Adding variable for messing with the prompt and setting
 the default to the example

---
 roles/custom/matrix-bot-chatgpt/defaults/main.yml | 2 ++
 roles/custom/matrix-bot-chatgpt/templates/env.j2  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml
index 00eae1676..298437ca3 100644
--- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml
+++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml
@@ -88,3 +88,5 @@ matrix_bot_chatgpt_matrix_rich_text: true  # MATRIX_RICH_TEXT=true
 # matrix_bot_chatgpt_environment_variables_extension: |
 #   chatgpt_TEXT_DONE=Done
 matrix_bot_chatgpt_environment_variables_extension: ''
+
+matrix_bot_chatgpt_matrix_bot_prompt_prefix: 'Instructions:\nYou are ChatGPT, a large language model trained by OpenAI.'
diff --git a/roles/custom/matrix-bot-chatgpt/templates/env.j2 b/roles/custom/matrix-bot-chatgpt/templates/env.j2
index bc8c38664..d9ca2d50c 100644
--- a/roles/custom/matrix-bot-chatgpt/templates/env.j2
+++ b/roles/custom/matrix-bot-chatgpt/templates/env.j2
@@ -25,6 +25,8 @@ MATRIX_ENCRYPTION={{ matrix_bot_chatgpt_matrix_encryption|lower }}
 MATRIX_THREADS={{ matrix_bot_chatgpt_matrix_threads|lower }}
 MATRIX_RICH_TEXT={{ matrix_bot_chatgpt_matrix_rich_text|lower }}
 
+CHATGPT_PROMPT_PREFIX={{ matrix_bot_chatgpt_matrix_bot_prompt_prefix }}
+
 DATA_PATH=/data/
 
 {{ matrix_bot_chatgpt_environment_variables_extension }}

From 0a6b934a44a4f2a6a7d0f146b026d4aeb66024f7 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 28 Jul 2023 17:17:48 +0300
Subject: [PATCH 12/58] Rename Element configuration key (preferredDomain ->
 preferred_domain)

Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2375#issuecomment-1655758296
---
 .../templates/static-files/well-known/matrix-client.j2        | 4 ++--
 roles/custom/matrix-client-element/templates/config.json.j2   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index 45c3ea2a0..e3a3172e6 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -20,10 +20,10 @@
 	{% endif %}
 	{% if matrix_client_element_jitsi_preferredDomain %},
 	"io.element.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferred_domain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
 	},
 	"im.vector.riot.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferred_domain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
 	}
 	{% endif %}
 	{% if matrix_sliding_sync_enabled %},
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 6f2498fd8..c0d11abdb 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -35,7 +35,7 @@
 	},
 	{% if matrix_client_element_jitsi_preferredDomain %}
 	"jitsi": {
-        "preferredDomain": {{ matrix_client_element_jitsi_preferredDomain | to_json }}
+        "preferred_domain": {{ matrix_client_element_jitsi_preferredDomain | to_json }}
     },
 	{% endif %}
 	{% if matrix_client_element_location_sharing_enabled %}

From f3445c124c088b0122ee0bb8dd7ae327c96a7fb4 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 28 Jul 2023 17:26:05 +0300
Subject: [PATCH 13/58] Fix Traefik support for
 matrix-user-verification-service

Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2375#issuecomment-1655758296
---
 group_vars/matrix_servers                     | 21 ++++++++++++-------
 .../defaults/main.yml                         |  8 +++++++
 .../tasks/setup_install.yml                   |  5 +++++
 ...atrix-user-verification-service.service.j2 | 10 +++++++--
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index bf9928d0e..74f382fa3 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4172,13 +4172,20 @@ matrix_user_verification_service_docker_image: "{{ matrix_user_verification_serv
 
 matrix_user_verification_service_enabled: false
 matrix_user_verification_service_systemd_required_services_list: |
-      {{
-        ['docker.service']
-        +
-        (['matrix-synapse.service'] if matrix_synapse_enabled else [])
-        +
-        ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
-      }}
+  {{
+    ['docker.service']
+    +
+    (['matrix-' + matrix_homeserver_implementation + '.service'])
+  }}
+
+matrix_user_verification_service_container_additional_networks: |
+  {{
+    (
+      ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else [])
+      +
+      ([matrix_homeserver_container_network] if matrix_homeserver_container_network != matrix_user_verification_service_container_network else [])
+    ) | unique
+  }}
 
 # If Jitsi is managed by this playbook we can use the docker network - no need to expose a port.
 # If Jitsi is not managed by this playbook, or you otherwise have a need for it, you can expose
diff --git a/roles/custom/matrix-user-verification-service/defaults/main.yml b/roles/custom/matrix-user-verification-service/defaults/main.yml
index 5b3611b88..b553ad12b 100644
--- a/roles/custom/matrix-user-verification-service/defaults/main.yml
+++ b/roles/custom/matrix-user-verification-service/defaults/main.yml
@@ -18,6 +18,14 @@ matrix_user_verification_service_docker_image_name_prefix: "{{ matrix_container_
 matrix_user_verification_service_docker_image: "{{ matrix_user_verification_service_docker_image_name_prefix }}matrixdotorg/matrix-user-verification-service:{{ matrix_user_verification_service_version }}"
 matrix_user_verification_service_docker_image_force_pull: "{{ matrix_user_verification_service_docker_image.endswith(':latest') }}"
 
+# The base container network. It will be auto-created by this role if it doesn't exist already.
+matrix_user_verification_service_container_network: "{{ matrix_docker_network }}"
+
+# A list of additional container networks that the container would be connected to.
+# The role does not create these networks, so make sure they already exist.
+# Use this to expose this container to another reverse proxy, which runs in a different container network.
+matrix_user_verification_service_container_additional_networks: []
+
 matrix_user_verification_service_container_name: "matrix-user-verification-service"
 # This will be set in group vars
 matrix_user_verification_service_container_http_host_bind_port: ''
diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
index 185b4b642..54d5d979b 100644
--- a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
@@ -30,6 +30,11 @@
     group: "{{ matrix_user_groupname }}"
     mode: 0644
 
+- name: Ensure matrix-user-verification-service container network is created
+  community.general.docker_network:
+    name: "{{ matrix_user_verification_service_container_network }}"
+    driver: bridge
+
 - name: Ensure matrix-user-verification-service.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-user-verification-service.service.j2"
diff --git a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
index eb24b1281..d42dc2d93 100644
--- a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
+++ b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
@@ -17,12 +17,14 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_user_verification_service_container_name }} 2>/dev/null'
 
 
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name  {{ matrix_user_verification_service_container_name }}\
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} run \
+			--rm \
+			--name={{ matrix_user_verification_service_container_name }}\
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
 			--read-only \
-			--network={{ matrix_docker_network }} \
+			--network={{ matrix_user_verification_service_container_network }} \
 			{% if matrix_user_verification_service_container_http_host_bind_port %}
 			-p {{ matrix_user_verification_service_container_http_host_bind_port }}:3000 \
 			{% endif %}
@@ -32,6 +34,10 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
 			{% endfor %}
 			{{ matrix_user_verification_service_docker_image }}
 
+{% for network in matrix_user_verification_service_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_user_verification_service_container_name }}
+{% endfor %}
+
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} kill {{ matrix_user_verification_service_container_name }} 2>/dev/null'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_user_verification_service_container_name }} 2>/dev/null'
 Restart=always

From 06e2ab94fdebba0ad2be29307986f66828436548 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 28 Jul 2023 20:53:44 +0300
Subject: [PATCH 14/58] Add missing space

Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2375#issuecomment-1656064975
---
 .../systemd/matrix-user-verification-service.service.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2 b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
index d42dc2d93..683982632 100644
--- a/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
+++ b/roles/custom/matrix-user-verification-service/templates/systemd/matrix-user-verification-service.service.j2
@@ -19,7 +19,7 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
 
 ExecStart={{ devture_systemd_docker_base_host_command_docker }} run \
 			--rm \
-			--name={{ matrix_user_verification_service_container_name }}\
+			--name={{ matrix_user_verification_service_container_name }} \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \

From 4a1ed92671d860f3c41cfeee56da6a11c47147b0 Mon Sep 17 00:00:00 2001
From: wuast94 <mihauku@googlemail.com>
Date: Sun, 30 Jul 2023 04:50:05 +0200
Subject: [PATCH 15/58] Add system promt variable to docs

Added the system promt variable and added a bit information for beginners
---
 docs/configuring-playbook-bot-chatgpt.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/configuring-playbook-bot-chatgpt.md b/docs/configuring-playbook-bot-chatgpt.md
index fa7972cae..72171f28c 100644
--- a/docs/configuring-playbook-bot-chatgpt.md
+++ b/docs/configuring-playbook-bot-chatgpt.md
@@ -43,6 +43,11 @@ matrix_bot_chatgpt_openai_api_key: ''
 # Matrix access token (from bot user above)
 # see: https://webapps.stackexchange.com/questions/131056/how-to-get-an-access-token-for-element-riot-matrix
 matrix_bot_chatgpt_matrix_access_token: ''
+
+# Configuring the system promt used, needed if the bot is used for special tasks.
+# More information: https://github.com/mustvlad/ChatGPT-System-Prompts
+matrix_bot_chatgpt_matrix_bot_prompt_prefix: 'Instructions:\nYou are ChatGPT, a large language model trained by OpenAI.'
+
 ```
 
 You will need to get tokens for ChatGPT.

From 8eac642a2d9bfce0ba436f4c29f33746ec65af19 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 30 Jul 2023 22:41:45 +0300
Subject: [PATCH 16/58] Upgrade Heisenbridge (1.14.3 -> 1.14.4)

---
 roles/custom/matrix-bridge-heisenbridge/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml b/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
index 5dfe38105..cba4d631a 100644
--- a/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
+++ b/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_heisenbridge_enabled: true
 
-matrix_heisenbridge_version: 1.14.3
+matrix_heisenbridge_version: 1.14.4
 matrix_heisenbridge_docker_image: "{{ matrix_container_global_registry_prefix }}hif1/heisenbridge:{{ matrix_heisenbridge_version }}"
 matrix_heisenbridge_docker_image_force_pull: "{{ matrix_heisenbridge_docker_image.endswith(':latest') }}"
 

From e7bc6b3729340040dccb7afbe0a5687781fb5467 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 31 Jul 2023 18:40:29 +0300
Subject: [PATCH 17/58] Upgrade appservice-slack (2.0.2 -> 2.1.2)

Related to https://matrix.org/blog/2023/07/bridges-security-updates/
---
 roles/custom/matrix-bridge-appservice-slack/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml b/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml
index 6fb6d7e7f..a3ea586be 100644
--- a/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml
+++ b/roles/custom/matrix-bridge-appservice-slack/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_appservice_slack_docker_src_files_path: "{{ matrix_base_data_path }}/apps
 
 # matrix_appservice_slack_version used to contain the full Docker image tag (e.g. `release-X.X.X`).
 # It's a bare version number now. We try to somewhat retain compatibility below.
-matrix_appservice_slack_version: 2.0.2
+matrix_appservice_slack_version: 2.1.2
 matrix_appservice_slack_docker_image: "{{ matrix_container_global_registry_prefix }}matrixdotorg/matrix-appservice-slack:{{ matrix_appservice_slack_docker_image_tag }}"
 matrix_appservice_slack_docker_image_tag: "{{ 'latest' if matrix_appservice_slack_version == 'latest' else ('release-' + matrix_appservice_slack_version) }}"
 matrix_appservice_slack_docker_image_force_pull: "{{ matrix_appservice_slack_docker_image.endswith(':latest') }}"

From bfe89df323c55ee3a2de2590d99b48f14a6e3d4e Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 31 Jul 2023 18:41:02 +0300
Subject: [PATCH 18/58] Upgrade appservice-irc (0.38.0 -> 1.0.1)

Related to: https://matrix.org/blog/2023/07/bridges-security-updates/
---
 roles/custom/matrix-bridge-appservice-irc/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-appservice-irc/defaults/main.yml b/roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
index b6e6f1195..2611da8a0 100644
--- a/roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
+++ b/roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_appservice_irc_docker_src_files_path: "{{ matrix_base_data_path }}/appser
 
 # matrix_appservice_irc_version used to contain the full Docker image tag (e.g. `release-X.X.X`).
 # It's a bare version number now. We try to somewhat retain compatibility below.
-matrix_appservice_irc_version: 0.38.0
+matrix_appservice_irc_version: 1.0.1
 matrix_appservice_irc_docker_image: "{{ matrix_container_global_registry_prefix }}matrixdotorg/matrix-appservice-irc:{{ matrix_appservice_irc_docker_image_tag }}"
 matrix_appservice_irc_docker_image_tag: "{{ 'latest' if matrix_appservice_irc_version == 'latest' else ('release-' + matrix_appservice_irc_version) }}"
 matrix_appservice_irc_docker_image_force_pull: "{{ matrix_appservice_irc_docker_image.endswith(':latest') }}"

From 2a56fe09c336bdffd938580266ffb1b6c9961524 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 31 Jul 2023 18:41:25 +0300
Subject: [PATCH 19/58] Upgrade Hookshot (4.4.0 -> 4.4.1)

Related to: https://matrix.org/blog/2023/07/bridges-security-updates/
---
 roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml
index 3c1ba5193..491bf3188 100644
--- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml
+++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml
@@ -10,7 +10,7 @@ matrix_hookshot_container_image_self_build: false
 matrix_hookshot_container_image_self_build_repo: "https://github.com/matrix-org/matrix-hookshot.git"
 matrix_hookshot_container_image_self_build_branch: "{{ 'main' if matrix_hookshot_version == 'latest' else matrix_hookshot_version }}"
 
-matrix_hookshot_version: 4.4.0
+matrix_hookshot_version: 4.4.1
 
 matrix_hookshot_docker_image: "{{ matrix_hookshot_docker_image_name_prefix }}halfshot/matrix-hookshot:{{ matrix_hookshot_version }}"
 matrix_hookshot_docker_image_name_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_container_global_registry_prefix }}"

From df406dbfd85039e0687847e41fcf803204a4bd23 Mon Sep 17 00:00:00 2001
From: adam-kress <okcoop@pm.me>
Date: Tue, 1 Aug 2023 08:12:35 -0400
Subject: [PATCH 20/58] Update synapse 1.88.0 -> 1.89.0

---
 roles/custom/matrix-synapse/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index 48d8e8d98..0e37be320 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_version: v1.88.0
+matrix_synapse_version: v1.89.0
 
 matrix_synapse_username: ''
 matrix_synapse_uid: ''

From 2bd9d2a142c27de163442bed9c80afd260c91e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= <julian-samuel@gebuehr.net>
Date: Tue, 1 Aug 2023 14:48:56 +0200
Subject: [PATCH 21/58] docs: Remove mention of access token

---
 docs/configuring-playbook-bot-matrix-registration-bot.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/configuring-playbook-bot-matrix-registration-bot.md b/docs/configuring-playbook-bot-matrix-registration-bot.md
index babfd2689..66b3e5768 100644
--- a/docs/configuring-playbook-bot-matrix-registration-bot.md
+++ b/docs/configuring-playbook-bot-matrix-registration-bot.md
@@ -14,8 +14,6 @@ does and why it might be useful to you.
 
 To enable the bot, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file:
 
-For `matrix_bot_matrix_registration_bot_api_token`you need an access token with the permission to access the admin api. Access to the API is needed for all restricted actions of the bot (list, create etc..). Refer to the documentation on [how to obtain an access token](obtaining-access-tokens.md).
-
 ```yaml
 matrix_bot_matrix_registration_bot_enabled: true
 

From 1b9a20bc2e2a6423ef336825376828efa4b8e724 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Tue, 1 Aug 2023 20:11:51 +0300
Subject: [PATCH 22/58] Update element 1.11.36 -> 1.11.37

---
 roles/custom/matrix-client-element/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 123cbd32a..f62ee35a3 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -10,7 +10,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/vecto
 # - https://github.com/vector-im/element-web/issues/19544
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
-matrix_client_element_version: v1.11.36
+matrix_client_element_version: v1.11.37
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"

From 9d08d8e32ef5204736cf5b34b033481311c26413 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Wed, 2 Aug 2023 21:53:00 +0300
Subject: [PATCH 23/58] Update honoroit 0.9.17 -> 0.9.18

---
 roles/custom/matrix-bot-honoroit/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bot-honoroit/defaults/main.yml b/roles/custom/matrix-bot-honoroit/defaults/main.yml
index 90ffa0c64..b190c3b79 100644
--- a/roles/custom/matrix-bot-honoroit/defaults/main.yml
+++ b/roles/custom/matrix-bot-honoroit/defaults/main.yml
@@ -20,7 +20,7 @@ matrix_bot_honoroit_docker_repo: "https://gitlab.com/etke.cc/honoroit.git"
 matrix_bot_honoroit_docker_repo_version: "{{ matrix_bot_honoroit_version }}"
 matrix_bot_honoroit_docker_src_files_path: "{{ matrix_base_data_path }}/honoroit/docker-src"
 
-matrix_bot_honoroit_version: v0.9.17
+matrix_bot_honoroit_version: v0.9.18
 matrix_bot_honoroit_docker_image: "{{ matrix_bot_honoroit_docker_image_name_prefix }}etke.cc/honoroit:{{ matrix_bot_honoroit_version }}"
 matrix_bot_honoroit_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_image_self_build else 'registry.gitlab.com/' }}"
 matrix_bot_honoroit_docker_image_force_pull: "{{ matrix_bot_honoroit_docker_image.endswith(':latest') }}"

From 90e39875258c53ec4542be6da4bb32ba09597623 Mon Sep 17 00:00:00 2001
From: krassle <6473406+krassle@users.noreply.github.com>
Date: Fri, 4 Aug 2023 16:10:23 +0200
Subject: [PATCH 24/58] Upgrade Element 1.11.37 -> 1.11.38

---
 roles/custom/matrix-client-element/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index f62ee35a3..39750ab0f 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -10,7 +10,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/vecto
 # - https://github.com/vector-im/element-web/issues/19544
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
-matrix_client_element_version: v1.11.37
+matrix_client_element_version: v1.11.38
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"

From 6d9a990657f3adbe9d89776a6ccc0078ecad14c7 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 4 Aug 2023 17:51:12 +0300
Subject: [PATCH 25/58] Partially revert (preferredDomain -> preferred_domain)
 renaming

Partially reverts 0a6b934a44a4f.

`preferred_domain` is only used by Element and does not apply to the
`/.well-known/matrix/client` file.
---
 .../templates/static-files/well-known/matrix-client.j2        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index e3a3172e6..45c3ea2a0 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -20,10 +20,10 @@
 	{% endif %}
 	{% if matrix_client_element_jitsi_preferredDomain %},
 	"io.element.jitsi": {
-		"preferred_domain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
 	},
 	"im.vector.riot.jitsi": {
-		"preferred_domain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
 	}
 	{% endif %}
 	{% if matrix_sliding_sync_enabled %},

From 4dfaeed4a1b8c90ca42bb0d1b49041cbe2c13493 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Sat, 5 Aug 2023 00:23:10 +0300
Subject: [PATCH 26/58] Update borg role v1.2.4-1.7.15-1 -> v1.2.4-1.7.15-2

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 1ef1f4da0..cc3f912cb 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,7 +4,7 @@
   version: v1.0.0-1
   name: auxiliary
 - src: git+https://gitlab.com/etke.cc/roles/backup_borg.git
-  version: v1.2.4-1.7.15-1
+  version: v1.2.4-1.7.15-2
 - src: git+https://github.com/devture/com.devture.ansible.role.container_socket_proxy.git
   version: v0.1.1-2
 - src: git+https://github.com/devture/com.devture.ansible.role.docker_sdk_for_python.git

From 4b61aca11e14e42672b83e08b63d3cb2f9a8e9b0 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 5 Aug 2023 09:01:33 +0300
Subject: [PATCH 27/58] Upgrade Prometheus (v2.45.0-0 -> v2.45.0-1)

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 1ef1f4da0..42a146708 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -42,7 +42,7 @@
 - src: git+https://gitlab.com/etke.cc/roles/ntfy.git
   version: v2.6.2-0
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git
-  version: v2.45.0-0
+  version: v2.45.0-1
   name: prometheus
 - src: git+https://gitlab.com/etke.cc/roles/prometheus_node_exporter.git
   version: v1.6.0-0

From b9b68c7110d256c72c06e6d6bd87285d81e8f52a Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Sat, 5 Aug 2023 12:48:11 +0200
Subject: [PATCH 28/58] Upgrade sliding-sync (v0.99.4 -> v0.99.5)

---
 roles/custom/matrix-sliding-sync/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-sliding-sync/defaults/main.yml b/roles/custom/matrix-sliding-sync/defaults/main.yml
index cfc55ecd2..97301597a 100644
--- a/roles/custom/matrix-sliding-sync/defaults/main.yml
+++ b/roles/custom/matrix-sliding-sync/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_sliding_sync_enabled: true
 
-matrix_sliding_sync_version: v0.99.4
+matrix_sliding_sync_version: v0.99.5
 
 matrix_sliding_sync_scheme: https
 

From 1dfe7a3da83ed4570c1ea4564430a997fd6bb4dd Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Sat, 5 Aug 2023 14:09:35 +0300
Subject: [PATCH 29/58] Update backup-borg role

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index cc3f912cb..23f45962d 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,7 +4,7 @@
   version: v1.0.0-1
   name: auxiliary
 - src: git+https://gitlab.com/etke.cc/roles/backup_borg.git
-  version: v1.2.4-1.7.15-2
+  version: v1.2.4-1.7.15-3
 - src: git+https://github.com/devture/com.devture.ansible.role.container_socket_proxy.git
   version: v0.1.1-2
 - src: git+https://github.com/devture/com.devture.ansible.role.docker_sdk_for_python.git

From ccebbc07ca2ab931adde9e8fb12306949d0b6d2d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 6 Aug 2023 12:13:56 +0300
Subject: [PATCH 30/58] Upgrade Traefik (v2.10.4-0 -> v2.10.4-1)

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 26d4f0c84..0ba980c3f 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -26,7 +26,7 @@
 - src: git+https://github.com/devture/com.devture.ansible.role.timesync.git
   version: v1.0.0-0
 - src: git+https://github.com/devture/com.devture.ansible.role.traefik.git
-  version: v2.10.4-0
+  version: v2.10.4-1
 - src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git
   version: v2.8.1-0
 - src: git+https://gitlab.com/etke.cc/roles/etherpad.git

From 809316b16eb4a9b229c3b10c2fb1d239ed3c028b Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:47:29 +0300
Subject: [PATCH 31/58] element-web camelCase renaming (showLabsSettings ->
 show_labs_settings)

---
 roles/custom/matrix-client-element/defaults/main.yml     | 2 +-
 .../matrix-client-element/tasks/validate_config.yml      | 9 +++++++++
 .../matrix-client-element/templates/config.json.j2       | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 39750ab0f..f64f302d3 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -151,7 +151,7 @@ matrix_client_element_integrations_widgets_urls: ["https://scalar.vector.im/api"
 matrix_client_element_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html"
 matrix_client_element_permalinkPrefix: "https://matrix.to"  # noqa var-naming
 matrix_client_element_bug_report_endpoint_url: "https://element.io/bugreports/submit"
-matrix_client_element_showLabsSettings: true  # noqa var-naming
+matrix_client_element_show_lab_settings: true  # noqa var-naming
 # Element public room directory server(s)
 matrix_client_element_roomdir_servers: ['matrix.org']
 matrix_client_element_welcome_user_id: ~
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index fdf42df7a..50455caeb 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -27,6 +27,15 @@
   with_items:
     - {'old': 'matrix_riot_web_.*', 'new': 'matrix_client_element_.*'}
 
+- name: (Deprecation) Catch and report renamed element-web settings
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which now has a different name.
+      Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
+  when: "item.old in vars"
+  with_items:
+    - {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
+
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
     - name: Fail if required matrix-client-element Traefik settings not defined
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index c0d11abdb..5d5104036 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -22,7 +22,7 @@
 	"integrations_widgets_urls": {{ matrix_client_element_integrations_widgets_urls | to_json }},
 	"integrations_jitsi_widget_url": {{ matrix_client_element_integrations_jitsi_widget_url | string | to_json }},
 	"bug_report_endpoint_url": {{ matrix_client_element_bug_report_endpoint_url | to_json }},
-	"showLabsSettings": {{ matrix_client_element_showLabsSettings | to_json }},
+	"show_labs_settings": {{ matrix_client_element_show_lab_settings | to_json }},
 	"roomDirectory": {
 		"servers": {{ matrix_client_element_roomdir_servers | to_json }}
 	},

From c800af1bb62c6527c380fca1c9891c1c392cc57c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:48:22 +0300
Subject: [PATCH 32/58] element-web camelCase renaming (permalinkPrefix ->
 permalink_prefix)

---
 roles/custom/matrix-client-element/defaults/main.yml         | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index f64f302d3..3b1899cf3 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -149,7 +149,7 @@ matrix_client_element_integrations_ui_url: "https://scalar.vector.im/"
 matrix_client_element_integrations_rest_url: "https://scalar.vector.im/api"
 matrix_client_element_integrations_widgets_urls: ["https://scalar.vector.im/api"]
 matrix_client_element_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html"
-matrix_client_element_permalinkPrefix: "https://matrix.to"  # noqa var-naming
+matrix_client_element_permalink_prefix: "https://matrix.to"  # noqa var-naming
 matrix_client_element_bug_report_endpoint_url: "https://element.io/bugreports/submit"
 matrix_client_element_show_lab_settings: true  # noqa var-naming
 # Element public room directory server(s)
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index 50455caeb..425683b8d 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -35,6 +35,7 @@
   when: "item.old in vars"
   with_items:
     - {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
+    - {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 5d5104036..798faa1d8 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -13,7 +13,7 @@
 	},
 	"default_theme": {{ matrix_client_element_default_theme | string | to_json }},
 	"default_country_code": {{ matrix_client_element_default_country_code | string | to_json }},
-	"permalinkPrefix": {{ matrix_client_element_permalinkPrefix | string | to_json }},
+	"permalink_prefix": {{ matrix_client_element_permalink_prefix | string | to_json }},
 	"disable_custom_urls": {{ matrix_client_element_disable_custom_urls | to_json }},
 	"disable_guests": {{ matrix_client_element_disable_guests | to_json }},
 	"brand": {{ matrix_client_element_brand | to_json }},

From bb90a59bbb1ab7889b88fd43d4625308306e7479 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:49:48 +0300
Subject: [PATCH 33/58] element-web camelCase renaming (roomDirectory ->
 room_directory)

---
 roles/custom/matrix-client-element/defaults/main.yml         | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 3b1899cf3..f238636bf 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -153,7 +153,7 @@ matrix_client_element_permalink_prefix: "https://matrix.to"  # noqa var-naming
 matrix_client_element_bug_report_endpoint_url: "https://element.io/bugreports/submit"
 matrix_client_element_show_lab_settings: true  # noqa var-naming
 # Element public room directory server(s)
-matrix_client_element_roomdir_servers: ['matrix.org']
+matrix_client_element_room_directory_servers: ['matrix.org']
 matrix_client_element_welcome_user_id: ~
 # Branding of Element
 matrix_client_element_brand: "Element"
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index 425683b8d..4f5fd0ee7 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -36,6 +36,7 @@
   with_items:
     - {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
     - {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
+    - {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 798faa1d8..498b25807 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -23,8 +23,8 @@
 	"integrations_jitsi_widget_url": {{ matrix_client_element_integrations_jitsi_widget_url | string | to_json }},
 	"bug_report_endpoint_url": {{ matrix_client_element_bug_report_endpoint_url | to_json }},
 	"show_labs_settings": {{ matrix_client_element_show_lab_settings | to_json }},
-	"roomDirectory": {
-		"servers": {{ matrix_client_element_roomdir_servers | to_json }}
+	"room_directory": {
+		"servers": {{ matrix_client_element_room_directory_servers | to_json }}
 	},
 	"welcomeUserId": {{ matrix_client_element_welcome_user_id | to_json }},
 	{% if matrix_client_element_enable_presence_by_hs_url is not none %}

From d4e48a3a67c78be4e1ae6f5b0146aa176956d231 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:50:09 +0300
Subject: [PATCH 34/58] element-web camelCase renaming (welcomeUserId ->
 welcome_user_id)

---
 roles/custom/matrix-client-element/templates/config.json.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 498b25807..77cf5b266 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -26,7 +26,7 @@
 	"room_directory": {
 		"servers": {{ matrix_client_element_room_directory_servers | to_json }}
 	},
-	"welcomeUserId": {{ matrix_client_element_welcome_user_id | to_json }},
+	"welcome_user_id": {{ matrix_client_element_welcome_user_id | to_json }},
 	{% if matrix_client_element_enable_presence_by_hs_url is not none %}
 		"enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }},
 	{% endif %}

From c4f716624b0187912b47c171b9d609e8fb3c30dc Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:50:27 +0300
Subject: [PATCH 35/58] element-web camelCase renaming (embeddedPages ->
 embedded_pages)

---
 roles/custom/matrix-client-element/templates/config.json.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 77cf5b266..5465395df 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -30,7 +30,7 @@
 	{% if matrix_client_element_enable_presence_by_hs_url is not none %}
 		"enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }},
 	{% endif %}
-	"embeddedPages": {
+	"embedded_pages": {
 		"homeUrl": {{ matrix_client_element_embedded_pages_home_url | string | to_json }}
 	},
 	{% if matrix_client_element_jitsi_preferredDomain %}

From 38c9aa9369b21aa08e6b1aba0adde9793a3e7432 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:53:02 +0300
Subject: [PATCH 36/58] element-web camelCase renaming (settingDefault ->
 setting_defaults)

---
 docs/configuring-playbook-client-element.md                  | 2 +-
 roles/custom/matrix-client-element/defaults/main.yml         | 4 ++--
 roles/custom/matrix-client-element/tasks/prepare_themes.yml  | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/configuring-playbook-client-element.md b/docs/configuring-playbook-client-element.md
index 1f90aca68..ec8556011 100644
--- a/docs/configuring-playbook-client-element.md
+++ b/docs/configuring-playbook-client-element.md
@@ -32,7 +32,7 @@ Alternatively, **if there is no pre-defined variable** for an Element setting yo
 
 ## Themes
 
-To change the look of Element, you can define your own themes manually by using the `matrix_client_element_settingDefaults_custom_themes` setting.
+To change the look of Element, you can define your own themes manually by using the `matrix_client_element_setting_defaults_custom_themes` setting.
 
 Or better yet, you can automatically pull it all themes provided by the [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes) project by simply flipping a flag (`matrix_client_element_themes_enabled: true`).
 
diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index f238636bf..133f9d94a 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -207,14 +207,14 @@ matrix_client_element_themes_repository_version: master
 # Controls the default theme
 matrix_client_element_default_theme: 'light'
 
-# Controls the `settingsDefault.custom_themes` setting of the Element configuration.
+# Controls the `setting_defaults.custom_themes` setting of the Element configuration.
 # You can use this setting to define custom themes.
 #
 # Also, look at `matrix_client_element_themes_enabled` for a way to pull in a bunch of custom themes automatically.
 # If you define your own themes here and set `matrix_client_element_themes_enabled: true`, your themes will be preserved as well.
 #
 # Note that for a custom theme to work well, all Element instances that you use must have the same theme installed.
-matrix_client_element_settingDefaults_custom_themes: []  # noqa var-naming
+matrix_client_element_setting_defaults_custom_themes: []  # noqa var-naming
 
 # Default Element configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
diff --git a/roles/custom/matrix-client-element/tasks/prepare_themes.yml b/roles/custom/matrix-client-element/tasks/prepare_themes.yml
index 70646c94c..194335b2f 100644
--- a/roles/custom/matrix-client-element/tasks/prepare_themes.yml
+++ b/roles/custom/matrix-client-element/tasks/prepare_themes.yml
@@ -30,7 +30,7 @@
 
     - name: Load Element theme
       ansible.builtin.set_fact:
-        matrix_client_element_settingDefaults_custom_themes: "{{ matrix_client_element_settingDefaults_custom_themes + [item['content'] | b64decode | from_json] }}"  # noqa var-naming
+        matrix_client_element_setting_defaults_custom_themes: "{{ matrix_client_element_setting_defaults_custom_themes + [item['content'] | b64decode | from_json] }}"  # noqa var-naming
       with_items: "{{ matrix_client_element_theme_file_contents.results }}"
 
 #
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index 4f5fd0ee7..e78bd4a71 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -37,6 +37,7 @@
     - {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
     - {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
     - {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
+    - {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 5465395df..9b5ff153b 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -8,8 +8,8 @@
 			"base_url": {{ matrix_client_element_default_is_url | string | to_json }}
 		}
 	},
-	"settingDefaults": {
-		"custom_themes": {{ matrix_client_element_settingDefaults_custom_themes | to_json }}
+	"setting_defaults": {
+		"custom_themes": {{ matrix_client_element_setting_defaults_custom_themes | to_json }}
 	},
 	"default_theme": {{ matrix_client_element_default_theme | string | to_json }},
 	"default_country_code": {{ matrix_client_element_default_country_code | string | to_json }},

From e7c5eff924ffa97b7a9983740f874ecfc89c7390 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:54:48 +0300
Subject: [PATCH 37/58] element-web camelCase renaming
 (branding.authFooterLinks -> branding.auth_footer_links)

---
 roles/custom/matrix-client-element/defaults/main.yml         | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 133f9d94a..3152dd724 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -169,7 +169,7 @@ matrix_client_element_welcome_text: "_t('Decentralised, encrypted chat &amp; col
 
 # Links, shown in footer of welcome page:
 # [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
-matrix_client_element_branding_authFooterLinks: ~  # noqa var-naming
+matrix_client_element_branding_auth_footer_links: ~  # noqa var-naming
 
 # URL to image, shown during Login
 matrix_client_element_branding_authHeaderLogoUrl: "{{ matrix_client_element_welcome_logo }}"  # noqa var-naming
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index e78bd4a71..52aba3955 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -38,6 +38,7 @@
     - {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
     - {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
     - {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
+    - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 9b5ff153b..66b236a9e 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -42,7 +42,7 @@
 	"map_style_url": "https://{{ matrix_server_fqn_element }}/map_style.json",
 	{% endif %}
 	"branding": {
-		"authFooterLinks": {{ matrix_client_element_branding_authFooterLinks | to_json }},
+		"auth_footer_links": {{ matrix_client_element_branding_auth_footer_links | to_json }},
 		"authHeaderLogoUrl": {{ matrix_client_element_branding_authHeaderLogoUrl | to_json }},
 		"welcomeBackgroundUrl": {{ matrix_client_element_branding_welcomeBackgroundUrl | to_json }}
 	}

From 1918519e07abf4ac98d083291d0406de084daa22 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:55:44 +0300
Subject: [PATCH 38/58] element-web camelCase renaming
 (branding.authHeaderLogoUrl -> branding.auth_header_logo_url)

---
 roles/custom/matrix-client-element/defaults/main.yml         | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 3152dd724..1873dda5d 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -172,7 +172,7 @@ matrix_client_element_welcome_text: "_t('Decentralised, encrypted chat &amp; col
 matrix_client_element_branding_auth_footer_links: ~  # noqa var-naming
 
 # URL to image, shown during Login
-matrix_client_element_branding_authHeaderLogoUrl: "{{ matrix_client_element_welcome_logo }}"  # noqa var-naming
+matrix_client_element_branding_auth_header_logo_url: "{{ matrix_client_element_welcome_logo }}"  # noqa var-naming
 
 # URL to Wallpaper, shown in background of welcome page
 matrix_client_element_branding_welcomeBackgroundUrl: ~  # noqa var-naming
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index 52aba3955..216143c3a 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -39,6 +39,7 @@
     - {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
     - {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
     - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
+    - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 66b236a9e..d41523a73 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -43,7 +43,7 @@
 	{% endif %}
 	"branding": {
 		"auth_footer_links": {{ matrix_client_element_branding_auth_footer_links | to_json }},
-		"authHeaderLogoUrl": {{ matrix_client_element_branding_authHeaderLogoUrl | to_json }},
+		"auth_header_logo_url": {{ matrix_client_element_branding_auth_header_logo_url | to_json }},
 		"welcomeBackgroundUrl": {{ matrix_client_element_branding_welcomeBackgroundUrl | to_json }}
 	}
 }

From e9c0e90147e9502408d9fdcfe0620bd7cfced088 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:56:38 +0300
Subject: [PATCH 39/58] element-web camelCase renaming
 (branding.welcomeBackgroundUrl -> branding.welcome_background_url)

---
 roles/custom/matrix-client-element/defaults/main.yml         | 2 +-
 roles/custom/matrix-client-element/tasks/validate_config.yml | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 1873dda5d..ac1630014 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -175,7 +175,7 @@ matrix_client_element_branding_auth_footer_links: ~  # noqa var-naming
 matrix_client_element_branding_auth_header_logo_url: "{{ matrix_client_element_welcome_logo }}"  # noqa var-naming
 
 # URL to Wallpaper, shown in background of welcome page
-matrix_client_element_branding_welcomeBackgroundUrl: ~  # noqa var-naming
+matrix_client_element_branding_welcome_background_url: ~  # noqa var-naming
 
 matrix_client_element_page_template_welcome_path: "{{ role_path }}/templates/welcome.html.j2"
 
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index 216143c3a..e2241b749 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -40,6 +40,7 @@
     - {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
     - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
     - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
+    - {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index d41523a73..883c89bfc 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -44,6 +44,6 @@
 	"branding": {
 		"auth_footer_links": {{ matrix_client_element_branding_auth_footer_links | to_json }},
 		"auth_header_logo_url": {{ matrix_client_element_branding_auth_header_logo_url | to_json }},
-		"welcomeBackgroundUrl": {{ matrix_client_element_branding_welcomeBackgroundUrl | to_json }}
+		"welcome_background_url": {{ matrix_client_element_branding_welcome_background_url | to_json }}
 	}
 }

From ae12ab5c24a85ac8defaf7d20a75d9b9258f6b50 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:57:29 +0300
Subject: [PATCH 40/58] Rename variable
 (matrix_client_element_jitsi_preferredDomain ->
 matrix_client_element_jitsi_preferredDomain)

---
 group_vars/matrix_servers                                   | 2 +-
 roles/custom/matrix-base/defaults/main.yml                  | 2 +-
 .../templates/static-files/well-known/matrix-client.j2      | 6 +++---
 roles/custom/matrix-client-element/defaults/main.yml        | 2 +-
 .../custom/matrix-client-element/tasks/validate_config.yml  | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2 | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 74f382fa3..114fc09f2 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3341,7 +3341,7 @@ matrix_client_element_enable_presence_by_hs_url: |
 
 matrix_client_element_welcome_user_id: ~
 
-matrix_client_element_jitsi_preferredDomain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
+matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
 
 ######################################################################
 #
diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index 637ce3bb9..8642ace2d 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -158,7 +158,7 @@ matrix_integration_manager_ui_url: ~
 # The domain name where a Jitsi server is self-hosted.
 # If set, `/.well-known/matrix/client` will suggest Element clients to use that Jitsi server.
 # See: https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server
-matrix_client_element_jitsi_preferredDomain: ''  # noqa var-naming
+matrix_client_element_jitsi_preferred_domain: ''  # noqa var-naming
 
 # Controls whether Element should use End-to-End Encryption by default.
 # Setting this to false will update `/.well-known/matrix/client` and tell Element clients to avoid E2EE.
diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index 45c3ea2a0..4de91a370 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -18,12 +18,12 @@
 		]
 	}
 	{% endif %}
-	{% if matrix_client_element_jitsi_preferredDomain %},
+	{% if matrix_client_element_jitsi_preferred_domain %},
 	"io.element.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
 	},
 	"im.vector.riot.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
 	}
 	{% endif %}
 	{% if matrix_sliding_sync_enabled %},
diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index ac1630014..917738aee 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -183,7 +183,7 @@ matrix_client_element_page_template_welcome_path: "{{ role_path }}/templates/wel
 # point this to a `home.html` template file on your local filesystem.
 matrix_client_element_embedded_pages_home_path: ~
 
-matrix_client_element_jitsi_preferredDomain: ''  # noqa var-naming
+matrix_client_element_jitsi_preferred_domain: ''  # noqa var-naming
 
 # Controls whether the self-check feature should validate SSL certificates.
 matrix_client_element_self_check_validate_certificates: true
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index e2241b749..dc6c9f5ad 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -41,6 +41,7 @@
     - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
     - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
     - {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
+    - {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 883c89bfc..180a8f818 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -33,9 +33,9 @@
 	"embedded_pages": {
 		"homeUrl": {{ matrix_client_element_embedded_pages_home_url | string | to_json }}
 	},
-	{% if matrix_client_element_jitsi_preferredDomain %}
+	{% if matrix_client_element_jitsi_preferred_domain %}
 	"jitsi": {
-        "preferred_domain": {{ matrix_client_element_jitsi_preferredDomain | to_json }}
+        "preferred_domain": {{ matrix_client_element_jitsi_preferred_domain | to_json }}
     },
 	{% endif %}
 	{% if matrix_client_element_location_sharing_enabled %}

From 62a086d3e2fc7fcb3a8e47cdccac7fadd8efad85 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Thu, 10 Aug 2023 20:30:11 +0200
Subject: [PATCH 41/58] Update conduit 0.5.0 -> 0.6.0

---
 roles/custom/matrix-conduit/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-conduit/defaults/main.yml b/roles/custom/matrix-conduit/defaults/main.yml
index 7673a7d27..862e55c25 100644
--- a/roles/custom/matrix-conduit/defaults/main.yml
+++ b/roles/custom/matrix-conduit/defaults/main.yml
@@ -6,7 +6,7 @@ matrix_conduit_enabled: true
 
 matrix_conduit_docker_image: "{{ matrix_conduit_docker_image_name_prefix }}matrixconduit/matrix-conduit:{{ matrix_conduit_docker_image_tag }}"
 matrix_conduit_docker_image_name_prefix: "docker.io/"
-matrix_conduit_docker_image_tag: "v0.5.0"
+matrix_conduit_docker_image_tag: "v0.6.0"
 matrix_conduit_docker_image_force_pull: "{{ matrix_conduit_docker_image.endswith(':latest') }}"
 
 matrix_conduit_base_path: "{{ matrix_base_data_path }}/conduit"

From 9faa65f05914baa75a5eab06aa429d116c5eefe7 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Thu, 10 Aug 2023 22:07:33 +0200
Subject: [PATCH 42/58] Advertise sliding-sync support when using conduit

Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features.

https://gitlab.com/famedly/conduit/-/releases/v0.6.0
https://gitlab.com/famedly/conduit/-/merge_requests/501
---
 .../templates/static-files/well-known/matrix-client.j2        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index 4de91a370..549bfc8ae 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -30,6 +30,10 @@
 	"org.matrix.msc3575.proxy": {
 		"url": "{{ matrix_sliding_sync_base_url }}"
 	}
+ 	{% elif matrix_homeserver_implementation == 'conduit' %},
+	"org.matrix.msc3575.proxy": {
+		"url": "{{ matrix_homeserver_url }}"
+	}
 	{% endif %}
 	{% if matrix_client_element_location_sharing_enabled %},
 	"m.tile_server": {

From 837cca4ee16d989f4b336232b13665fcb319af31 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Fri, 11 Aug 2023 08:13:49 +0000
Subject: [PATCH 43/58] Move sliding sync url logic out of matrix-client.j2

---
 group_vars/matrix_servers                                 | 4 ++++
 roles/custom/matrix-base/defaults/main.yml                | 6 ++++++
 .../templates/static-files/well-known/matrix-client.j2    | 8 ++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 114fc09f2..1273280ea 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4018,6 +4018,8 @@ matrix_sliding_sync_environment_variable_syncv3_secret: "{{ '%s' | format(matrix
 matrix_sliding_sync_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
 matrix_sliding_sync_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'ss.db', rounds=655555) | to_uuid }}"
 
+matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_sliding_sync_enabled else matrix_homeserver_sliding_sync_url }}"
+
 ######################################################################
 #
 # /matrix-sliding-sync
@@ -4107,6 +4109,8 @@ matrix_conduit_systemd_required_services_list: |
     (['docker.service'])
   }}
 
+# Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features.
+matrix_homeserver_sliding_sync_url: "{{ matrix_homeserver_url if matrix_conduit_enabled and not matrix_sliding_sync_enabled else matrix_homeserver_sliding_sync_url }}"
 
 ######################################################################
 #
diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index 8642ace2d..bb0d579fb 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -150,6 +150,12 @@ matrix_homeserver_container_url: ""
 # This likely gets overriden elsewhere.
 matrix_homeserver_container_federation_url: ""
 
+# Specifies the public url of the Sync v3 (sliding-sync) API.
+# This will be used to set the `org.matrix.msc3575.proxy` property in `/.well-known/matrix/client`.
+# Once the API is stabilized, this will no longer be required.
+# See MSC3575: https://github.com/matrix-org/matrix-spec-proposals/blob/kegan/sync-v3/proposals/3575-sync.md
+matrix_homeserver_sliding_sync_url: ""
+
 matrix_identity_server_url: ~
 
 matrix_integration_manager_rest_url: ~
diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index 549bfc8ae..96c301a89 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -26,13 +26,9 @@
 		"preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
 	}
 	{% endif %}
-	{% if matrix_sliding_sync_enabled %},
+	{% if matrix_homeserver_sliding_sync_url %},
 	"org.matrix.msc3575.proxy": {
-		"url": "{{ matrix_sliding_sync_base_url }}"
-	}
- 	{% elif matrix_homeserver_implementation == 'conduit' %},
-	"org.matrix.msc3575.proxy": {
-		"url": "{{ matrix_homeserver_url }}"
+		"url": "{{ matrix_homeserver_sliding_sync_url }}"
 	}
 	{% endif %}
 	{% if matrix_client_element_location_sharing_enabled %},

From 28b736fc9d6b39c28165477dc9d73d769edd7818 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Fri, 11 Aug 2023 08:30:22 +0000
Subject: [PATCH 44/58] docs: conduit sliding sync support

---
 docs/configuring-playbook-sliding-sync-proxy.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/configuring-playbook-sliding-sync-proxy.md b/docs/configuring-playbook-sliding-sync-proxy.md
index a0eb36ba4..a7aab981c 100644
--- a/docs/configuring-playbook-sliding-sync-proxy.md
+++ b/docs/configuring-playbook-sliding-sync-proxy.md
@@ -12,6 +12,7 @@ Element X Android requires manual compilation to get it working with a non-`matr
 
 **NOTE**: The Sliding Sync proxy **only works with the Traefik reverse-proxy**. If you have an old server installation (from the time `matrix-nginx-proxy` was our default reverse-proxy - `matrix_playbook_reverse_proxy_type: playbook-managed-nginx`), you won't be able to use Sliding Sync.
 
+**NOTE**: The sliding-sync proxy is **not required** when using the **Conduit homeserver**. Starting from version `0.6.0` Conduit has native support for some sliding sync features. If there are issues with the native implementation, you might have a better experience when enabling the sliding-sync proxy anyway.
 
 ## Decide on a domain and path
 

From e01a6f29720577675242c36ff6b7efe6f7c26e44 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Fri, 11 Aug 2023 08:46:03 +0000
Subject: [PATCH 45/58] fix: `recursive loop detected in template string` error

---
 group_vars/matrix_servers | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 1273280ea..5accdd85a 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4018,7 +4018,8 @@ matrix_sliding_sync_environment_variable_syncv3_secret: "{{ '%s' | format(matrix
 matrix_sliding_sync_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
 matrix_sliding_sync_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'ss.db', rounds=655555) | to_uuid }}"
 
-matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_sliding_sync_enabled else matrix_homeserver_sliding_sync_url }}"
+# Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features.
+matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_sliding_sync_enabled else matrix_homeserver_url if matrix_conduit_enabled else '' }}"
 
 ######################################################################
 #
@@ -4109,9 +4110,6 @@ matrix_conduit_systemd_required_services_list: |
     (['docker.service'])
   }}
 
-# Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features.
-matrix_homeserver_sliding_sync_url: "{{ matrix_homeserver_url if matrix_conduit_enabled and not matrix_sliding_sync_enabled else matrix_homeserver_sliding_sync_url }}"
-
 ######################################################################
 #
 # /matrix-conduit

From 75d4b534844fbcb0df03ad34a2496115786d1529 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 15 Aug 2023 11:17:41 +0300
Subject: [PATCH 46/58] Upgrade ddclient (v3.10.0-ls126 -> v3.10.0-ls131)

---
 roles/custom/matrix-dynamic-dns/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-dynamic-dns/defaults/main.yml b/roles/custom/matrix-dynamic-dns/defaults/main.yml
index 6369f1096..727dfd5bb 100644
--- a/roles/custom/matrix-dynamic-dns/defaults/main.yml
+++ b/roles/custom/matrix-dynamic-dns/defaults/main.yml
@@ -7,7 +7,7 @@ matrix_dynamic_dns_enabled: true
 # The dynamic dns daemon interval
 matrix_dynamic_dns_daemon_interval: '300'
 
-matrix_dynamic_dns_version: v3.10.0-ls126
+matrix_dynamic_dns_version: v3.10.0-ls131
 
 # The docker container to use when in mode
 matrix_dynamic_dns_docker_image: "{{ matrix_dynamic_dns_docker_image_name_prefix }}linuxserver/ddclient:{{ matrix_dynamic_dns_version }}"

From 68562173e71ee9a9a4e341151b157ac5821f3a21 Mon Sep 17 00:00:00 2001
From: slikie <13197246+slikie@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:37:35 +0800
Subject: [PATCH 47/58] bump synapse to v1.90.0

---
 roles/custom/matrix-synapse/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index 0e37be320..c48ff09c6 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_version: v1.89.0
+matrix_synapse_version: v1.90.0
 
 matrix_synapse_username: ''
 matrix_synapse_uid: ''

From f55d5be6c3746dfae6411f779c38ab667fd04a79 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Tue, 15 Aug 2023 20:59:54 +0300
Subject: [PATCH 48/58] Update Element 1.11.38 -> 1.11.39

---
 roles/custom/matrix-client-element/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 917738aee..b9a1aabae 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -10,7 +10,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/vecto
 # - https://github.com/vector-im/element-web/issues/19544
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
-matrix_client_element_version: v1.11.38
+matrix_client_element_version: v1.11.39
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"

From 8903b1e341b30c928950983c30fef9ac43cb85df Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 16 Aug 2023 07:10:07 +0300
Subject: [PATCH 49/58] Upgrade Heisenbridge (1.14.4 -> 1.14.5)

---
 roles/custom/matrix-bridge-heisenbridge/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml b/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
index cba4d631a..c81c4fe6b 100644
--- a/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
+++ b/roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_heisenbridge_enabled: true
 
-matrix_heisenbridge_version: 1.14.4
+matrix_heisenbridge_version: 1.14.5
 matrix_heisenbridge_docker_image: "{{ matrix_container_global_registry_prefix }}hif1/heisenbridge:{{ matrix_heisenbridge_version }}"
 matrix_heisenbridge_docker_image_force_pull: "{{ matrix_heisenbridge_docker_image.endswith(':latest') }}"
 

From 4574ebbd31888c26dc72a9449e8b6c7427e8bc3f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 16 Aug 2023 09:17:32 +0300
Subject: [PATCH 50/58] Add notes about Dimension being unmaintained

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2806
---
 docs/configuring-playbook-dimension.md | 2 ++
 docs/configuring-playbook.md           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md
index 4472e103e..cafe6f4d6 100644
--- a/docs/configuring-playbook-dimension.md
+++ b/docs/configuring-playbook-dimension.md
@@ -3,6 +3,8 @@
 **[Dimension](https://dimension.t2bot.io) can only be installed after Matrix services are installed and running.**
 If you're just installing Matrix services for the first time, please continue with the [Configuration](configuring-playbook.md) / [Installation](installing.md) flow and come back here later.
 
+**Note**: Dimension is **[officially unmaintained](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2806#issuecomment-1673559299)**. We recommend not bothering with installing it.
+
 **Note**: This playbook now supports running [Dimension](https://dimension.t2bot.io) in both a federated and [unfederated](https://github.com/turt2live/matrix-dimension/blob/master/docs/unfederated.md) environments. This is handled automatically based on the value of `matrix_synapse_federation_enabled`. Enabling Dimension, means that the `openid` API endpoints will be exposed on the Matrix Federation port (usually `8448`), even if [federation](configuring-playbook-federation.md) is disabled. It's something to be aware of, especially in terms of firewall whitelisting (make sure port `8448` is accessible).
 
 
diff --git a/docs/configuring-playbook.md b/docs/configuring-playbook.md
index a4746a62c..85ae79d7a 100644
--- a/docs/configuring-playbook.md
+++ b/docs/configuring-playbook.md
@@ -30,7 +30,7 @@ When you're done with all the configuration you'd like to do, continue with [Ins
 
 ### Additional useful services
 
-- [Setting up the Dimension Integration Manager](configuring-playbook-dimension.md) (optional, but recommended; after [installing](installing.md))
+- [Setting up the Dimension Integration Manager](configuring-playbook-dimension.md) (optional; [unmaintained](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2806#issuecomment-1673559299); after [installing](installing.md))
 
 - [Setting up the Jitsi video-conferencing platform](configuring-playbook-jitsi.md) (optional)
 

From e7e81f7828911d19924c15c57b00e52655ed4861 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Wed, 16 Aug 2023 10:09:22 +0300
Subject: [PATCH 51/58] update nginx 1.25.1 -> 1.25.2

---
 roles/custom/matrix-nginx-proxy/defaults/main.yml               | 2 +-
 .../matrix-synapse-reverse-proxy-companion/defaults/main.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/custom/matrix-nginx-proxy/defaults/main.yml b/roles/custom/matrix-nginx-proxy/defaults/main.yml
index d8d73a869..8767fee1e 100644
--- a/roles/custom/matrix-nginx-proxy/defaults/main.yml
+++ b/roles/custom/matrix-nginx-proxy/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Project source code URL: https://github.com/nginx/nginx
 matrix_nginx_proxy_enabled: true
-matrix_nginx_proxy_version: 1.25.1-alpine
+matrix_nginx_proxy_version: 1.25.2-alpine
 
 # We use an official nginx image, which we fix-up to run unprivileged.
 # An alternative would be an `nginxinc/nginx-unprivileged` image, but
diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml
index 048ded6bb..3a29791ce 100644
--- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml
+++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml
@@ -25,7 +25,7 @@
 
 matrix_synapse_reverse_proxy_companion_enabled: true
 
-matrix_synapse_reverse_proxy_companion_version: 1.25.1-alpine
+matrix_synapse_reverse_proxy_companion_version: 1.25.2-alpine
 
 matrix_synapse_reverse_proxy_companion_base_path: "{{ matrix_synapse_base_path }}/reverse-proxy-companion"
 matrix_synapse_reverse_proxy_companion_confd_path: "{{ matrix_synapse_reverse_proxy_companion_base_path }}/conf.d"

From 4fb0a0222e78ad7adf95dc607e95c4253773fd33 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:10:39 +0300
Subject: [PATCH 52/58] Update redis 7.0.10 -> 7.0.12

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 0ba980c3f..0c85d1992 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -50,4 +50,4 @@
   version: v0.13.2-0
   name: prometheus_postgres_exporter
 - src: git+https://gitlab.com/etke.cc/roles/redis.git
-  version: v7.0.10-0
+  version: v7.0.12-0

From 5da7b911f7e422fd91323711370d4d8407ff6238 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Wed, 16 Aug 2023 10:23:07 +0300
Subject: [PATCH 53/58] update docker role; update prometheus node exporter
 (1.6.0 -> 1.6.1)

---
 requirements.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.yml b/requirements.yml
index 0c85d1992..a44152a36 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -32,7 +32,7 @@
 - src: git+https://gitlab.com/etke.cc/roles/etherpad.git
   version: v1.9.0-0
 - src: git+https://github.com/geerlingguy/ansible-role-docker
-  version: 6.1.0
+  version: 6.2.0
   name: geerlingguy.docker
 - src: git+https://gitlab.com/etke.cc/roles/grafana.git
   version: v10.0.3-0
@@ -45,7 +45,7 @@
   version: v2.45.0-1
   name: prometheus
 - src: git+https://gitlab.com/etke.cc/roles/prometheus_node_exporter.git
-  version: v1.6.0-0
+  version: v1.6.1-0
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-postgres-exporter.git
   version: v0.13.2-0
   name: prometheus_postgres_exporter

From afd3e1bd9d4c12f819e0fa09a6755a0b4a2e7170 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 17 Aug 2023 10:38:06 +0300
Subject: [PATCH 54/58] Pin mautrix-gmessages to v0.1.0

Related to https://github.com/mautrix/gmessages/releases/tag/v0.1.0
---
 roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml
index 6a6c14b0a..9448dfde6 100644
--- a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_mautrix_gmessages_container_image_self_build: false
 matrix_mautrix_gmessages_container_image_self_build_repo: "https://github.com/mautrix/gmessages.git"
 matrix_mautrix_gmessages_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_gmessages_version == 'latest' else matrix_mautrix_gmessages_version }}"
 
-matrix_mautrix_gmessages_version: latest
+matrix_mautrix_gmessages_version: v0.1.0
 # See: https://mau.dev/mautrix/gmessages/container_registry
 matrix_mautrix_gmessages_docker_image: "{{ matrix_mautrix_gmessages_docker_image_name_prefix }}mautrix/gmessages:{{ matrix_mautrix_gmessages_version }}"
 matrix_mautrix_gmessages_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_gmessages_container_image_self_build else 'dock.mau.dev/' }}"

From 33e56f44ca0b167a0c1d36d6ec8623aba4f9d517 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 17 Aug 2023 10:38:49 +0300
Subject: [PATCH 55/58] Upgrade mautrix-whatsapp (0.9.0 -> 0.10.0)

---
 roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml
index a308811a7..fb11bc691 100644
--- a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_mautrix_whatsapp_container_image_self_build: false
 matrix_mautrix_whatsapp_container_image_self_build_repo: "https://mau.dev/mautrix/whatsapp.git"
 matrix_mautrix_whatsapp_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_whatsapp_version == 'latest' else matrix_mautrix_whatsapp_version }}"
 
-matrix_mautrix_whatsapp_version: v0.9.0
+matrix_mautrix_whatsapp_version: v0.10.0
 # See: https://mau.dev/mautrix/whatsapp/container_registry
 matrix_mautrix_whatsapp_docker_image: "{{ matrix_mautrix_whatsapp_docker_image_name_prefix }}mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}"
 matrix_mautrix_whatsapp_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_whatsapp_container_image_self_build else 'dock.mau.dev/' }}"

From c9a549b1f5359263302c2e97a6e5fdba4cfde191 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 17 Aug 2023 10:39:25 +0300
Subject: [PATCH 56/58] Upgrade mautrix-discord (0.6.0 -> 0.6.1)

---
 roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
index f9b853bc6..1f1e007ac 100644
--- a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_mautrix_discord_container_image_self_build: false
 matrix_mautrix_discord_container_image_self_build_repo: "https://mau.dev/mautrix/discord.git"
 matrix_mautrix_discord_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_discord_version == 'latest' else matrix_mautrix_discord_version }}"
 
-matrix_mautrix_discord_version: v0.6.0
+matrix_mautrix_discord_version: v0.6.1
 # See: https://mau.dev/mautrix/discord/container_registry
 matrix_mautrix_discord_docker_image: "{{ matrix_mautrix_discord_docker_image_name_prefix }}mautrix/discord:{{ matrix_mautrix_discord_version }}"
 matrix_mautrix_discord_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_discord_container_image_self_build else 'dock.mau.dev/' }}"

From 221dd613f073d696c571dea6f78317f74370d4f5 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Fri, 18 Aug 2023 01:41:30 +0300
Subject: [PATCH 57/58] update etherpad (1.9.0 -> 1.9.2); update ntfy (2.6.2 ->
 2.7.0)

---
 requirements.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.yml b/requirements.yml
index a44152a36..7490bb6ee 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -30,7 +30,7 @@
 - src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git
   version: v2.8.1-0
 - src: git+https://gitlab.com/etke.cc/roles/etherpad.git
-  version: v1.9.0-0
+  version: v1.9.2-0
 - src: git+https://github.com/geerlingguy/ansible-role-docker
   version: 6.2.0
   name: geerlingguy.docker
@@ -40,7 +40,7 @@
   version: v8615-2
   name: jitsi
 - src: git+https://gitlab.com/etke.cc/roles/ntfy.git
-  version: v2.6.2-0
+  version: v2.7.0-0
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git
   version: v2.45.0-1
   name: prometheus

From b7076719c72742f24c32522efc07452d80cb4d94 Mon Sep 17 00:00:00 2001
From: Aine <97398200+etkecc@users.noreply.github.com>
Date: Fri, 18 Aug 2023 08:50:06 +0300
Subject: [PATCH 58/58] Update redis 7.0.12 -> 7.2.0

---
 requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.yml b/requirements.yml
index 7490bb6ee..af22b8770 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -50,4 +50,4 @@
   version: v0.13.2-0
   name: prometheus_postgres_exporter
 - src: git+https://gitlab.com/etke.cc/roles/redis.git
-  version: v7.0.12-0
+  version: v7.2.0-0