Merge branch 'master' into pub.solar

Makefile

@@ -1,7 +1,7 @@
 .PHONY: lint
 
 help: ## Show this help.
-	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
+	@grep -F -h "##" $(MAKEFILE_LIST) | grep -v grep | sed -e 's/\\$$//' | sed -e 's/##//'
 
 lint: ## Runs ansible-lint against all roles in the playbook
 	ansible-lint

docs/configuring-dns.md

@@ -26,6 +26,8 @@ Be mindful as to how long it will take for the DNS records to propagate.
 
 If you are using Cloudflare DNS, make sure to disable the proxy and set all records to `DNS only`. Otherwise, fetching certificates will fail.
 
+When you're done configuring DNS, proceed to [Configuring the playbook](configuring-playbook.md).
+
 ## DNS settings for optional services/features
 
 | Used by component                                                                                                       | Type  | Host                           | Priority | Weight | Port | Target                      |
@@ -45,6 +47,8 @@ If you are using Cloudflare DNS, make sure to disable the proxy and set all reco
 | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge                                                       | TXT   | `_dmarc.matrix`                | -        | -      | -    | `v=DMARC1; p=quarantine;`   |
 | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge                                                       | TXT   | `postmoogle._domainkey.matrix` | -        | -      | -    | get it from `!pm dkim`      |
 
+When setting up a SRV record, if you are asked for a service and protocol instead of a hostname split the host value from the table where the period is. For example use service as `_matrix-identity` and protocol as `_tcp`.
+
 ## Subdomains setup
 
 As the table above illustrates, you need to create 2 subdomains (`matrix.<your-domain>` and `element.<your-domain>`) and point both of them to your new server's IP address (DNS `A` record or `CNAME` record is fine).

docs/configuring-playbook-backup-borg.md

@@ -56,7 +56,7 @@ where:
 
 * USER - SSH user of a provider/server
 * HOST - SSH host of a provider/server
-* REPO - borg repository name, it will be initialized on backup start, eg: `matrix`
+* REPO - borg repository name, it will be initialized on backup start, eg: `matrix`, regarding Syntax see [Remote repositories](https://borgbackup.readthedocs.io/en/stable/usage/general.html#repository-urls)
 * PASSPHRASE - passphrase used for encrypting backups, you may generate it with `pwgen -s 64 1` or use any password manager
 * PRIVATE KEY - the content of the **private** part of the SSH key you created before. The whole key (all of its belonging lines) under `matrix_backup_borg_ssh_key_private` needs to be indented with 2 spaces
 
@@ -73,3 +73,9 @@ After configuring the playbook, run the [installation](installing.md) command ag
 ```
 ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
 ```
+
+## Manually start a backup
+
+For testing your setup it can be helpful to not wait until 4am. If you want to run the backup immediately, log onto the server
+and run `systemctl start matrix-backup-borg`. This will not return until the backup is done, so possibly a long time.
+Consider using [tmux](https://en.wikipedia.org/wiki/Tmux) if your SSH connection is unstable.

docs/configuring-playbook-bot-buscarron.md

@@ -36,10 +36,10 @@ matrix_bot_buscarron_forms:
     room: "!yourRoomID:DOMAIN" # (mandatory) Room ID where form submission will be posted
     redirect: https://DOMAIN # (mandatory) To what page user will be redirected after the form submission
     ratelimit: 1r/m # (optional) rate limit of the form, format: <max requests>r/<interval:s,m>, eg: 1r/s or 54r/m
+    hasemail: 1 # (optional) form has "email" field that should be validated
     extensions: [] # (optional) list of form extensions (not used yet)
 
-matrix_bot_buscarron_spam_hosts: [] # (optional) list of email domains/hosts that should be rejected automatically
-matrix_bot_buscarron_spam_emails: [] # (optional) list of email addresses that should be rejected automatically
+matrix_bot_buscarron_spamlist: [] # (optional) list of emails/domains/hosts (with wildcards support) that should be rejected automatically
 ```
 
 You will also need to add a DNS record so that buscarron can be accessed.

docs/configuring-playbook-bridge-mautrix-discord.md

@@ -12,7 +12,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/go/discord/index.h
 
 ## Prerequisites
 
-For using this bridge, you would **need to authenticate by scanning a QR code with the Discord app on your phone**.
+For using this bridge, you would need to authenticate by **scanning a QR code** with the Discord app on your phone **or** by using **discord account token**.
 
 You can delete the Discord app after the authentication process.
 
@@ -70,7 +70,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee
 ## Usage
 
 1. Start a chat with `@discordbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain).
-2. Send a `login` command
+2. If you would like to login to Discord using a token, send `login-token` command, otherwise, send `login-qr` command.
 3. You'll see a QR code which you need to scan with the Discord app on your phone. You can scan it with the camera app too, which will open Discord, which will then instruct you to scan it a 2nd time in the Discord app.
 4. After confirming (in the Discord app) that you'd like to allow this login, the bot should respond with "Succcessfully authenticated as ..."
 5. Now that you're logged in, you can send a `help` command to the bot again, to see additional commands you have access to

docs/configuring-playbook-conduit.md

@@ -0,0 +1,58 @@
+# Configuring Conduit (optional)
+
+By default, this playbook configures the [Synapse](https://github.com/matrix-org/synapse) Matrix server, but you can also use [Conduit](https://conduit.rs).
+
+**NOTES**:
+
+- **You can't switch an existing Matrix server's implementation** (e.g. Synapse -> Conduit). Proceed below only if you're OK with losing data or you're dealing with a server on a new domain name, which hasn't participated in the Matrix federation yet.
+
+- **homeserver implementations other than Synapse may not be fully functional**. The playbook may also not assist you in an optimal way (like it does with Synapse). Make yourself familiar with the downsides before proceeding
+
+
+## Installation
+
+To use Conduit, you **generally** need the following additional `vars.yml` configuration:
+
+```yaml
+matrix_homeserver_implementation: conduit
+```
+
+However, since Conduit is difficult (see [famedly/conduit#276](https://gitlab.com/famedly/conduit/-/issues/276) and [famedly/conduit#354](https://gitlab.com/famedly/conduit/-/merge_requests/354)) when it comes to creating the first user account and does not support [registering users](registering-users.md) (via the command line or via the playbook) like Synapse and Dendrite do, we recommend the following flow:
+
+1. Add `matrix_conduit_allow_registration: true` to your `vars.yml` the first time around, temporarily
+2. Run the playbook (`ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start` - see [Installing](installing.md))
+3. Create your first user via Element or any other client which supports creating users
+4. Get rid of `matrix_conduit_allow_registration: true` from your `vars.yml`
+5. Run the playbook again (`ansible-playbook -i inventory/hosts setup.yml --tags=setup-conduit,start` would be enough this time)
+6. You can now use your server safely. Additional users can be created by messaging the internal Conduit bot
+
+
+## Configuring bridges / appservices
+
+Automatic appservice setup is currently unsupported when using conduit. After setting up the service as usual you may notice that it is unable to start.
+
+You will have to manually register appservices using the the [register-appservice](https://gitlab.com/famedly/conduit/-/blob/next/APPSERVICES.md) command.
+
+Find the `registration.yaml` in the `/matrix` directory, for example `/matrix/mautrix-signal/bridge/registration.yaml`, then pass the content to conduit:
+
+
+    @conduit:your.server.name: register-appservice
+    ```
+    as_token: <token>
+    de.sorunome.msc2409.push_ephemeral: true
+    hs_token: <token>
+    id: signal
+    namespaces:
+      aliases:
+      - exclusive: true
+        regex: ^#signal_.+:example\.org$
+      users:
+      - exclusive: true
+        regex: ^@signal_.+:example\.org$
+      - exclusive: true
+        regex: ^@signalbot:example\.org$
+    rate_limited: false
+    sender_localpart: _bot_signalbot
+    url: http://matrix-mautrix-signal:29328
+    ```
+

docs/configuring-playbook-ssl-certificates.md

@@ -99,7 +99,7 @@ The certificate files would be made available in `/matrix/ssl/config/live/<your-
 
 For automated certificate renewal to work, each port `80` vhost for each domain you are obtaining certificates for needs to forward requests for `/.well-known/acme-challenge` to the certbot container we use for renewal.
 
-See how this is configured for the `matrix.` subdomain in `/matrix/nginx-proxy/conf.d/matrix-synapse.conf`
+See how this is configured for the `matrix.` subdomain in `/matrix/nginx-proxy/conf.d/matrix-domain.conf`
 Don't be alarmed if the above configuration file says port `8080`, instead of port `80`. It's due to port mapping due to our use of containers.
 
 

docs/configuring-playbook.md

@@ -42,7 +42,10 @@ When you're done with all the configuration you'd like to do, continue with [Ins
 
 ### Core service adjustments
 
-- [Configuring Synapse](configuring-playbook-synapse.md) (optional)
+- Homeserver configuration:
+  - [Configuring Synapse](configuring-playbook-synapse.md), if you're going with the default/recommended homeserver implementation (optional)
+
+  - [Configuring Conduit](configuring-playbook-conduit.md), if you've switched to the [Conduit](https://conduit.rs) homeserver implementation (optional)
 
 - [Configuring Element](configuring-playbook-client-element.md) (optional)
 

docs/configuring-well-known.md

@@ -192,7 +192,7 @@ Make sure to:
 
 ## Confirming it works
 
-No matter which method you've used to set up the well-known files, if you've done it correctly you should be able to see a JSON file at both of these URLs:
+No matter which method you've used to set up the well-known files, if you've done it correctly you should be able to see a JSON file at these URLs:
 
 - `https://<domain>/.well-known/matrix/server`
 - `https://<domain>/.well-known/matrix/client`

docs/prerequisites.md

@@ -26,7 +26,7 @@ If your distro runs within an [LXC container](https://linuxcontainers.org/), you
 
 - Properly configured DNS records for `<your-domain>` (details in [Configuring DNS](configuring-dns.md)).
 
-- Some TCP/UDP ports open. This playbook configures the server's internal firewall for you. In most cases, you don't need to do anything special. But **if your server is running behind another firewall**, you'd need to open these ports:
+- Some TCP/UDP ports open. This playbook (actually [Docker itself](https://docs.docker.com/network/iptables/)) configures the server's internal firewall for you. In most cases, you don't need to do anything special. But **if your server is running behind another firewall**, you'd need to open these ports:
 
   - `80/tcp`: HTTP webserver
   - `443/tcp`: HTTPS webserver

examples/vars.yml

@@ -12,7 +12,9 @@
 matrix_domain: YOUR_BARE_DOMAIN_NAME_HERE
 
 # The Matrix homeserver software to install.
-# See `roles/matrix-base/defaults/main.yml` for valid options.
+# See:
+#  - `roles/matrix-base/defaults/main.yml` for valid options
+# - the `docs/configuring-playbook-IMPLEMENTATION_NAME.md` documentation page, if one is available for your implementation choice
 matrix_homeserver_implementation: synapse
 
 # A secret used as a base, for generating various other secrets.

group_vars/matrix_servers

@@ -1163,7 +1163,7 @@ matrix_bot_honoroit_systemd_required_services_list: |
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_bot_honoroit_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_bot_honoroit_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'honoroit.bot.db') | to_uuid }}"
-matrix_bot_honoroit_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
+matrix_bot_honoroit_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
 
 ######################################################################
 #
@@ -1194,7 +1194,7 @@ matrix_bot_buscarron_systemd_required_services_list: |
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_bot_buscarron_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_bot_buscarron_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'buscarron.bot.db') | to_uuid }}"
-matrix_bot_buscarron_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
+matrix_bot_buscarron_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
 
 ######################################################################
 #
@@ -1227,7 +1227,7 @@ matrix_bot_postmoogle_systemd_required_services_list: |
 matrix_bot_postmoogle_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_bot_postmoogle_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'postmoogle.db') | to_uuid }}"
 
-matrix_bot_postmoogle_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
+matrix_bot_postmoogle_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
 
 ######################################################################
 #
@@ -2112,18 +2112,9 @@ matrix_postgres_additional_databases: |
 
    }}
 
-matrix_postgres_import_roles_to_ignore: |
+matrix_postgres_systemd_services_to_stop_for_maintenance_list: |
   {{
-    [matrix_postgres_connection_username]
-    +
-    matrix_postgres_additional_databases|map(attribute='username') | list
-  }}
-
-matrix_postgres_import_databases_to_ignore: |
-  {{
-    [matrix_postgres_db_name]
-    +
-    matrix_postgres_additional_databases|map(attribute='name') | list
+    ['matrix-' + matrix_homeserver_implementation + '.service']
   }}
 
 ######################################################################

roles/matrix-aux/defaults/main.yml

@@ -50,6 +50,9 @@ matrix_aux_file_default_mode: '0640'
 # then you likely need to add `/matrix/some/path` to `matrix_aux_directory_definitions` as well.
 # You don't need to do this for directories that the playbook already creates for you.
 #
+# Use a `content` key for text content and `src` with a location to a file for binary content.
+# The `content` key does not support binary content (see https://github.com/ansible/ansible/issues/11594).
+#
 # Example:
 #
 # matrix_aux_file_definitions:
@@ -69,4 +72,10 @@ matrix_aux_file_default_mode: '0640'
 #     mode: '0600'
 #     owner: 'some-user'
 #     group: 'some-group'
+#
+#   - dest: /matrix/aux/binary-file.dat
+#     src: "/path/to/binary.dat"
+#     mode: '0600'
+#     owner: 'some-user'
+#     group: 'some-group'
 matrix_aux_file_definitions: []

roles/matrix-aux/tasks/setup.yml

@@ -11,8 +11,9 @@
 
 - name: Ensure AUX files are created
   ansible.builtin.copy:
+    src: "{{ item.src if 'src' in item else omit }}"
+    content: "{{ item.content if 'content' in item else omit }}"
     dest: "{{ item.dest }}"
-    content: "{{ item.content }}"
     owner: "{{ item.owner | default(matrix_user_username) }}"
     group: "{{ item.group | default(matrix_user_groupname) }}"
     mode: "{{ item.mode | default(matrix_aux_file_default_mode) }}"

roles/matrix-backup-borg/tasks/setup_install.yml

@@ -59,7 +59,7 @@
     mode: 0600
 
 - name: Ensure borg image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_backup_borg_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_backup_borg_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -82,7 +82,7 @@
   when: "matrix_backup_borg_container_image_self_build | bool"
 
 - name: Ensure borg image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_backup_borg_docker_image }}"
     source: build
     force_source: "{{ matrix_backup_borg_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-backup-borg/tasks/setup_uninstall.yml

@@ -36,6 +36,6 @@
     state: absent
 
 - name: Ensure borg Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_backup_borg_docker_image }}"
     state: absent

roles/matrix-base/tasks/server_base/setup.yml

@@ -21,7 +21,8 @@
     register: lsb_release_installation_result
 
   - name: Reread ansible_lsb facts if lsb-release got installed
-    ansible.builtin.setup: filter=ansible_lsb*
+    ansible.builtin.setup:
+      filter: ansible_lsb*
     when: lsb_release_installation_result.changed
 
   - ansible.builtin.include_tasks: "{{ role_path }}/tasks/server_base/setup_debian.yml"

roles/matrix-base/tasks/server_base/setup_archlinux.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Install host dependencies
-  pacman:
+  community.general.pacman:
     name:
       - python-docker
       - python-dnspython
@@ -9,7 +9,7 @@
     update_cache: true
 
 - name: Ensure Docker is installed
-  pacman:
+  community.general.pacman:
     name:
       - docker
     state: present

roles/matrix-base/tasks/setup_matrix_base.yml

@@ -20,7 +20,7 @@
   when: "matrix_vars_yml_snapshotting_enabled | bool"
 
 - name: Ensure Matrix network is created in Docker
-  docker_network:
+  community.docker.docker_network:
     name: "{{ matrix_docker_network }}"
     driver: bridge
 

roles/matrix-base/tasks/util/ensure_fuse_installed.yml

@@ -16,7 +16,7 @@
   when: ansible_os_family == 'Debian'
 
 - name: Ensure fuse installed (Archlinux)
-  pacman:
+  community.general.pacman:
     name:
       - fuse3
     state: present

roles/matrix-base/tasks/util/ensure_openssl_installed.yml

@@ -16,7 +16,7 @@
   when: ansible_os_family == 'Debian'
 
 - name: Ensure openssl installed (Archlinux)
-  pacman:
+  community.general.pacman:
     name:
       - openssl
     state: present

roles/matrix-bot-buscarron/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_bot_buscarron_docker_repo: "https://gitlab.com/etke.cc/buscarron.git"
 matrix_bot_buscarron_docker_repo_version: "{{ matrix_bot_buscarron_version }}"
 matrix_bot_buscarron_docker_src_files_path: "{{ matrix_base_data_path }}/buscarron/docker-src"
 
-matrix_bot_buscarron_version: v1.2.1
+matrix_bot_buscarron_version: v1.3.0
 matrix_bot_buscarron_docker_image: "{{ matrix_bot_buscarron_docker_image_name_prefix }}buscarron:{{ matrix_bot_buscarron_version }}"
 matrix_bot_buscarron_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else 'registry.gitlab.com/etke.cc/' }}"
 matrix_bot_buscarron_docker_image_force_pull: "{{ matrix_bot_buscarron_docker_image.endswith(':latest') }}"
@@ -78,37 +78,49 @@ matrix_bot_buscarron_homeserver: "{{ matrix_homeserver_container_url }}"
 matrix_bot_buscarron_forms: []
 
 # Disable encryption
-matrix_bot_buscarron_noencryption:
+matrix_bot_buscarron_noencryption: false
 
 # Sentry DSN
-matrix_bot_buscarron_sentry:
+matrix_bot_buscarron_sentry: ''
 
 # Log level
 matrix_bot_buscarron_loglevel: INFO
 
-# spam hosts/domains
+# list of spammers with wildcards support, eg: *@spam.com spam@*, spam@spam.com
+matrix_bot_buscarron_spamlist: []
+
+# spam hosts/domains.
+# deprecated, use matrix_bot_buscarron_spamlist
 matrix_bot_buscarron_spam_hosts: []
 
 # spam email addresses
+# deprecated, use matrix_bot_buscarron_spamlist
 matrix_bot_buscarron_spam_emails: []
 
 # spam email localparts
+# deprecated, use matrix_bot_buscarron_spamlist
 matrix_bot_buscarron_spam_localparts: []
 
-# Ban duration in hours
-matrix_bot_buscarron_ban_duration: 24
-
 # Banlist size
 matrix_bot_buscarron_ban_size: 10000
 
+# Permanent banlist
+matrix_bot_buscarron_ban_list: []
+
 # Postmark token (confirmation emails)
-matrix_bot_buscarron_pm_token:
+matrix_bot_buscarron_pm_token: ''
 
 # Postmark sender signature
-matrix_bot_buscarron_pm_from:
+matrix_bot_buscarron_pm_from: ''
 
 # Postmark confirmation email's reply-to
-matrix_bot_buscarron_pm_replyto:
+matrix_bot_buscarron_pm_replyto: ''
+
+# email address (from) for SMTP validation. Must be valid email on valid SMTP server, otherwise it will be rejected by other servers
+matrix_bot_buscarron_smtp_from: ''
+
+# enforce SMTP validation
+matrix_bot_buscarron_smtp_validation: false
 
 # Additional environment variables to pass to the buscarron container
 #

roles/matrix-bot-buscarron/tasks/setup_install.yml

@@ -50,7 +50,7 @@
     mode: 0640
 
 - name: Ensure buscarron image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_buscarron_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_buscarron_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -73,7 +73,7 @@
   when: "matrix_bot_buscarron_container_image_self_build | bool"
 
 - name: Ensure buscarron image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_buscarron_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_buscarron_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-buscarron/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure buscarron Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_buscarron_docker_image }}"
     state: absent

roles/matrix-bot-buscarron/templates/env.j2

@@ -3,22 +3,26 @@ BUSCARRON_PASSWORD={{ matrix_bot_buscarron_password }}
 BUSCARRON_HOMESERVER={{ matrix_bot_buscarron_homeserver }}
 BUSCARRON_DB_DSN={{ matrix_bot_buscarron_database_connection_string }}
 BUSCARRON_DB_DIALECT={{ matrix_bot_buscarron_database_dialect }}
+BUSCARRON_SPAMLIST={{ matrix_bot_buscarron_spamlist|join(" ") }}
 BUSCARRON_SPAM_HOSTS={{ matrix_bot_buscarron_spam_hosts|join(" ") }}
 BUSCARRON_SPAM_EMAILS={{ matrix_bot_buscarron_spam_emails|join(" ") }}
 BUSCARRON_SPAM_LOCALPARTS={{ matrix_bot_buscarron_spam_localparts|join(" ") }}
 BUSCARRON_SENTRY={{ matrix_bot_buscarron_sentry }}
 BUSCARRON_LOGLEVEL={{ matrix_bot_buscarron_loglevel }}
-BUSCARRON_BAN_DURATION={{ matrix_bot_buscarron_ban_duration }}
 BUSCARRON_BAN_SIZE={{ matrix_bot_buscarron_ban_size }}
+BUSCARRON_BAN_LIST={{ matrix_bot_buscarron_ban_list|default('')|join(' ') }}
 BUSCARRON_PM_TOKEN={{ matrix_bot_buscarron_pm_token }}
 BUSCARRON_PM_FROM={{ matrix_bot_buscarron_pm_from }}
 BUSCARRON_PM_REPLYTO={{ matrix_bot_buscarron_pm_replyto }}
+BUSCARRON_SMTP_FROM={{ matrix_bot_buscarron_smtp_from }}
+BUSCARRON_SMTP_VALIDATION={{ matrix_bot_buscarron_smtp_validation }}
 BUSCARRON_NOENCRYPTION={{ matrix_bot_buscarron_noencryption }}
 {% set forms = [] %}
 {% for form in matrix_bot_buscarron_forms -%}{{- forms.append(form.name) -}}
 BUSCARRON_{{ form.name|upper }}_ROOM={{ form.room|default('') }}
 BUSCARRON_{{ form.name|upper }}_REDIRECT={{ form.redirect|default('') }}
 BUSCARRON_{{ form.name|upper }}_HASDOMAIN={{ form.hasdomain|default('') }}
+BUSCARRON_{{ form.name|upper }}_HASEMAIL={{ form.hasemail|default('') }}
 BUSCARRON_{{ form.name|upper }}_RATELIMIT={{ form.ratelimit|default('') }}
 BUSCARRON_{{ form.name|upper }}_EXTENSIONS={{ form.extensions|default('')|join(' ') }}
 BUSCARRON_{{ form.name|upper }}_CONFIRMATION_SUBJECT={{ form.confirmation_subject|default('') }}

roles/matrix-bot-go-neb/tasks/setup_install.yml

@@ -17,7 +17,7 @@
   when: "item.when | bool"
 
 - name: Ensure go-neb image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_go_neb_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_go_neb_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-go-neb/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure go-neb Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_go_neb_docker_image }}"
     state: absent

roles/matrix-bot-honoroit/defaults/main.yml

@@ -9,7 +9,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.15
+matrix_bot_honoroit_version: v0.9.16
 matrix_bot_honoroit_docker_image: "{{ matrix_bot_honoroit_docker_image_name_prefix }}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/etke.cc/' }}"
 matrix_bot_honoroit_docker_image_force_pull: "{{ matrix_bot_honoroit_docker_image.endswith(':latest') }}"

roles/matrix-bot-honoroit/tasks/setup_install.yml

@@ -50,7 +50,7 @@
     mode: 0640
 
 - name: Ensure honoroit image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_honoroit_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_honoroit_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -73,7 +73,7 @@
   when: "matrix_bot_honoroit_container_image_self_build | bool"
 
 - name: Ensure honoroit image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_honoroit_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_honoroit_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-honoroit/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure honoroit Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_honoroit_docker_image }}"
     state: absent

roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml

@@ -22,7 +22,7 @@
     mode: 0640
 
 - name: Ensure matrix-registration-bot image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_matrix_registration_bot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -45,7 +45,7 @@
   when: "matrix_bot_matrix_registration_bot_container_image_self_build | bool"
 
 - name: Ensure matrix-registration-bot image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_matrix_registration_bot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-matrix-registration-bot/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure matrix-registration-bot Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
     state: absent

roles/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml

@@ -43,7 +43,7 @@
   when: "item.when | bool"
 
 - name: Ensure matrix-reminder-bot image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_reminder_bot_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_matrix_reminder_bot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -66,7 +66,7 @@
   when: "matrix_bot_matrix_reminder_bot_container_image_self_build | bool"
 
 - name: Ensure matrix-reminder-bot image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_reminder_bot_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_matrix_reminder_bot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-matrix-reminder-bot/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure matrix-reminder-bot Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_matrix_reminder_bot_docker_image }}"
     state: absent

roles/matrix-bot-maubot/tasks/setup_install.yml

@@ -26,7 +26,7 @@
     mode: "u=rwx"
 
 - name: Ensure maubot image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_maubot_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_maubot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -49,7 +49,7 @@
   when: "matrix_bot_maubot_container_image_self_build|bool"
 
 - name: Ensure maubot image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_maubot_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_maubot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-maubot/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure maubot Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_maubot_docker_image }}"
     state: absent

roles/matrix-bot-mjolnir/tasks/setup_install.yml

@@ -18,7 +18,7 @@
   when: "item.when | bool"
 
 - name: Ensure mjolnir Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_mjolnir_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_mjolnir_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -41,7 +41,7 @@
   when: "matrix_bot_mjolnir_container_image_self_build | bool"
 
 - name: Ensure mjolnir Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_mjolnir_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_mjolnir_git_pull_results.changed }}"

roles/matrix-bot-mjolnir/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure mjolnir Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_mjolnir_docker_image }}"
     state: absent

roles/matrix-bot-postmoogle/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_bot_postmoogle_docker_repo: "https://gitlab.com/etke.cc/postmoogle.git"
 matrix_bot_postmoogle_docker_repo_version: "{{ 'main' if matrix_bot_postmoogle_version == 'latest' else matrix_bot_postmoogle_version }}"
 matrix_bot_postmoogle_docker_src_files_path: "{{ matrix_base_data_path }}/postmoogle/docker-src"
 
-matrix_bot_postmoogle_version: v0.9.7
+matrix_bot_postmoogle_version: v0.9.8
 matrix_bot_postmoogle_docker_image: "{{ matrix_bot_postmoogle_docker_image_name_prefix }}postmoogle:{{ matrix_bot_postmoogle_version }}"
 matrix_bot_postmoogle_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_postmoogle_container_image_self_build else 'registry.gitlab.com/etke.cc/' }}"
 matrix_bot_postmoogle_docker_image_force_pull: "{{ matrix_bot_postmoogle_docker_image.endswith(':latest') }}"

roles/matrix-bot-postmoogle/tasks/setup_install.yml

@@ -46,7 +46,7 @@
     mode: 0640
 
 - name: Ensure postmoogle image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_postmoogle_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_bot_postmoogle_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -69,7 +69,7 @@
   when: "matrix_bot_postmoogle_container_image_self_build | bool"
 
 - name: Ensure postmoogle image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_postmoogle_docker_image }}"
     source: build
     force_source: "{{ matrix_bot_postmoogle_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bot-postmoogle/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure postmoogle Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_bot_postmoogle_docker_image }}"
     state: absent

roles/matrix-bridge-appservice-discord/tasks/setup_install.yml

@@ -29,7 +29,7 @@
             matrix_appservice_discord_requires_restart: true
 
 - name: Ensure Appservice Discord image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_discord_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_discord_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-appservice-discord/tasks/validate_config.yml

@@ -22,5 +22,6 @@
     - {'old': 'matrix_appservice_discord_container_expose_client_server_api_port', 'new': '<superseded by matrix_appservice_discord_container_http_host_bind_port>'}
 
 - name: Require a valid database engine
-  ansible.builtin.fail: msg="`matrix_appservice_discord_database_engine` needs to be either 'sqlite' or 'postgres'"
+  ansible.builtin.fail:
+    msg: "`matrix_appservice_discord_database_engine` needs to be either 'sqlite' or 'postgres'"
   when: "matrix_appservice_discord_database_engine not in ['sqlite', 'postgres']"

roles/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.35.1
+matrix_appservice_irc_version: 0.36.0
 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') }}"

roles/matrix-bridge-appservice-irc/tasks/setup_install.yml

@@ -64,7 +64,7 @@
             matrix_appservice_irc_requires_restart: true
 
 - name: Ensure Appservice IRC image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_irc_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_irc_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -87,7 +87,7 @@
   when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-irc Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_irc_docker_image }}"
     source: build
     force_source: "{{ matrix_appservice_irc_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml

@@ -9,7 +9,7 @@
   when: "matrix_synapse_role_executed | default(False)"
 
 - name: Ensure matrix-appservice-kakaotalk image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_kakaotalk_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_kakaotalk_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -21,7 +21,7 @@
   until: result is not failed
 
 - name: Ensure matrix-appservice-kakaotalk-node image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_kakaotalk_node_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_kakaotalk_node_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -58,7 +58,7 @@
   when: "matrix_appservice_kakaotalk_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-kakaotalk-node Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_kakaotalk_node_docker_image }}"
     source: build
     force_source: "{{ matrix_appservice_kakaotalk_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -70,7 +70,7 @@
   when: "matrix_appservice_kakaotalk_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-kakaotalk Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_kakaotalk_docker_image }}"
     source: build
     force_source: "{{ matrix_appservice_kakaotalk_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-appservice-slack/tasks/setup_install.yml

@@ -32,7 +32,7 @@
             matrix_appservice_slack_requires_restart: true
 
 - name: Ensure Appservice Slack image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_slack_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_slack_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -55,7 +55,7 @@
   when: "matrix_appservice_slack_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-slack Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_slack_docker_image }}"
     source: build
     force_source: "{{ matrix_appservice_slack_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-appservice-webhooks/tasks/setup_install.yml

@@ -15,7 +15,7 @@
   when: "item.when | bool"
 
 - name: Ensure Appservice webhooks image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_appservice_webhooks_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_appservice_webhooks_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -39,7 +39,7 @@
       register: matrix_appservice_webhooks_git_pull_results
 
     - name: Ensure Appservice webhooks Docker image is built
-      docker_image:
+      community.docker.docker_image:
         name: "{{ matrix_appservice_webhooks_docker_image }}"
         source: build
         force_source: "{{ matrix_appservice_webhooks_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-beeper-linkedin/tasks/setup_install.yml

@@ -23,7 +23,7 @@
 
 
 - name: Ensure Beeper LinkedIn image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_beeper_linkedin_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_beeper_linkedin_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -62,7 +62,7 @@
       changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0
 
     - name: Ensure Beeper LinkedIn Docker image is built
-      docker_image:
+      community.docker.docker_image:
         name: "{{ matrix_beeper_linkedin_docker_image }}"
         source: build
         force_source: "{{ matrix_beeper_linkedin_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-go-skype-bridge/tasks/setup_install.yml

@@ -52,7 +52,7 @@
   when: item.when | bool
 
 - name: Ensure Go Skype Bridge image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_go_skype_bridge_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_go_skype_bridge_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -75,7 +75,7 @@
   when: "matrix_go_skype_bridge_container_image_self_build | bool"
 
 - name: Ensure Go Skype Bridge Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_go_skype_bridge_docker_image }}"
     source: build
     force_source: "{{ matrix_go_skype_bridge_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-heisenbridge/tasks/setup_install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Ensure heisenbridge image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_heisenbridge_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_heisenbridge_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/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: 2.3.0
+matrix_hookshot_version: 2.4.0
 
 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 }}"

roles/matrix-bridge-hookshot/tasks/setup_install.yml

@@ -15,7 +15,7 @@
   when: item.when | bool
 
 - name: Ensure hookshot image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_hookshot_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_hookshot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -38,7 +38,7 @@
   when: "matrix_hookshot_container_image_self_build | bool"
 
 - name: Ensure hookshot Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_hookshot_docker_image }}"
     source: build
     force_source: "{{ matrix_hookshot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-discord/tasks/setup_install.yml

@@ -52,7 +52,7 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Discord image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_discord_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_discord_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -75,7 +75,7 @@
   when: "matrix_mautrix_discord_container_image_self_build | bool"
 
 - name: Ensure Mautrix discord Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_discord_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_discord_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml

@@ -37,7 +37,7 @@
             matrix_mautrix_facebook_requires_restart: true
 
 - name: Ensure Mautrix Facebook image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_facebook_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_facebook_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -74,7 +74,7 @@
   when: "matrix_mautrix_facebook_container_image_self_build | bool"
 
 - name: Ensure Mautrix Facebook Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_facebook_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_facebook_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml

@@ -37,7 +37,7 @@
             matrix_mautrix_googlechat_requires_restart: true
 
 - name: Ensure Mautrix googlechat image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_googlechat_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_googlechat_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -74,7 +74,7 @@
   when: "matrix_mautrix_googlechat_container_image_self_build | bool"
 
 - name: Ensure Mautrix googlechat Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_googlechat_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_googlechat_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml

@@ -37,7 +37,7 @@
             matrix_mautrix_hangouts_requires_restart: true
 
 - name: Ensure Mautrix Hangouts image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_hangouts_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_hangouts_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -74,7 +74,7 @@
   when: "matrix_mautrix_hangouts_container_image_self_build | bool"
 
 - name: Ensure Mautrix Hangouts Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_hangouts_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_hangouts_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml

@@ -8,7 +8,7 @@
   when: "matrix_synapse_role_executed | default(False)"
 
 - name: Ensure Mautrix instagram image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_instagram_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_instagram_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -45,7 +45,7 @@
   when: "matrix_mautrix_instagram_container_image_self_build | bool"
 
 - name: Ensure Mautrix instagram Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_instagram_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_instagram_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-signal/defaults/main.yml

@@ -9,8 +9,8 @@ matrix_mautrix_signal_docker_repo: "https://mau.dev/mautrix/signal.git"
 matrix_mautrix_signal_docker_repo_version: "{{ 'master' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}"
 matrix_mautrix_signal_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-signal/docker-src"
 
-matrix_mautrix_signal_version: v0.4.0
-matrix_mautrix_signal_daemon_version: 0.22.2
+matrix_mautrix_signal_version: v0.4.1
+matrix_mautrix_signal_daemon_version: 0.23.0
 # See: https://mau.dev/mautrix/signal/container_registry
 matrix_mautrix_signal_docker_image: "dock.mau.dev/mautrix/signal:{{ matrix_mautrix_signal_version }}"
 matrix_mautrix_signal_docker_image_force_pull: "{{ matrix_mautrix_signal_docker_image.endswith(':latest') }}"

roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml

@@ -9,7 +9,7 @@
   when: "matrix_synapse_role_executed | default(False)"
 
 - name: Ensure Mautrix Signal image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_signal_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -33,7 +33,7 @@
   when: "matrix_mautrix_signal_container_image_self_build | bool"
 
 - name: Ensure Mautrix Signal image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_signal_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -46,7 +46,7 @@
 
 
 - name: Ensure Mautrix Signal Daemon image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_daemon_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_signal_daemon_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -66,7 +66,7 @@
   when: "matrix_mautrix_signal_daemon_container_image_self_build | bool"
 
 - name: Ensure Mautrix Signal Daemon image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_daemon_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_signal_daemon_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml

@@ -51,7 +51,7 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Telegram image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_telegram_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_telegram_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -74,7 +74,7 @@
   when: "matrix_telegram_lottieconverter_container_image_self_build | bool and matrix_mautrix_telegram_container_image_self_build | bool"
 
 - name: Ensure lottieconverter Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_telegram_lottieconverter_docker_image }}"
     source: build
     force_source: "{{ matrix_telegram_lottieconverter_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -97,7 +97,7 @@
   when: "matrix_mautrix_telegram_container_image_self_build | bool"
 
 - name: Ensure matrix-mautrix-telegram Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_telegram_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_telegram_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mautrix-twitter/tasks/setup_install.yml

@@ -12,7 +12,7 @@
     matrix_mautrix_twitter_requires_restart: false
 
 - name: Ensure Mautrix Twitter image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_twitter_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_twitter_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -49,7 +49,7 @@
   when: "matrix_mautrix_twitter_enabled | bool and matrix_mautrix_twitter_container_image_self_build"
 
 - name: Ensure Mautrix Twitter Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_twitter_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_twitter_git_pull_results.changed }}"

roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml

@@ -52,7 +52,7 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Whatsapp image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_whatsapp_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_whatsapp_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -75,7 +75,7 @@
   when: "matrix_mautrix_whatsapp_container_image_self_build | bool"
 
 - name: Ensure Mautrix Whatsapp Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_whatsapp_docker_image }}"
     source: build
     force_source: "{{ matrix_mautrix_whatsapp_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml

@@ -71,7 +71,7 @@
             matrix_mx_puppet_discord_requires_restart: true
 
 - name: Ensure MX Puppet Discord image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_discord_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_discord_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -94,7 +94,7 @@
   when: "matrix_mx_puppet_discord_enabled | bool and matrix_mx_puppet_discord_container_image_self_build"
 
 - name: Ensure MX Puppet Discord Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_discord_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_discord_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml

@@ -69,7 +69,7 @@
             matrix_mx_puppet_groupme_requires_restart: true
 
 - name: Ensure MX Puppet Groupme image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_groupme_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_groupme_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -92,7 +92,7 @@
   when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
 
 - name: Ensure MX Puppet Groupme Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_groupme_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_groupme_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml

@@ -38,7 +38,7 @@
             matrix_mx_puppet_instagram_requires_restart: true
 
 - name: Ensure mx-puppet-instagram image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_instagram_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_instagram_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -75,7 +75,7 @@
   when: "matrix_mx_puppet_instagram_enabled | bool and matrix_mx_puppet_instagram_container_image_self_build | bool"
 
 - name: Ensure mx-puppet-instagram Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_instagram_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_instagram_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml

@@ -65,7 +65,7 @@
             matrix_mx_puppet_slack_requires_restart: true
 
 - name: Ensure MX Puppet Slack image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_slack_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_slack_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -88,7 +88,7 @@
   when: "matrix_mx_puppet_slack_enabled | bool and matrix_mx_puppet_slack_container_image_self_build"
 
 - name: Ensure MX Puppet Slack Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_slack_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_slack_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml

@@ -69,7 +69,7 @@
             matrix_mx_puppet_steam_requires_restart: true
 
 - name: Ensure MX Puppet Steam image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_steam_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_steam_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -92,7 +92,7 @@
   when: "matrix_mx_puppet_steam_enabled | bool and matrix_mx_puppet_steam_container_image_self_build"
 
 - name: Ensure MX Puppet Steam Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_steam_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_steam_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml

@@ -69,7 +69,7 @@
             matrix_mx_puppet_twitter_requires_restart: true
 
 - name: Ensure MX Puppet Twitter image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_twitter_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mx_puppet_twitter_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -92,7 +92,7 @@
   when: "matrix_mx_puppet_twitter_enabled | bool and matrix_mx_puppet_twitter_container_image_self_build"
 
 - name: Ensure MX Puppet Twitter Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mx_puppet_twitter_docker_image }}"
     source: build
     force_source: "{{ matrix_mx_puppet_twitter_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-bridge-sms/tasks/setup_install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Ensure matrix-sms-bridge image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_sms_bridge_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
   register: result

roles/matrix-cactus-comments/tasks/setup_install.yml

@@ -31,7 +31,7 @@
     mode: 0640
 
 - name: Ensure cactus comments image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_cactus_comments_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_cactus_comments_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -54,7 +54,7 @@
   when: "matrix_cactus_comments_container_image_self_build | bool"
 
 - name: Ensure cactus comments image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_cactus_comments_docker_image }}"
     source: build
     force_source: "{{ matrix_cactus_comments_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-cactus-comments/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure cactus comments Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_cactus_comments_docker_image }}"
     state: absent

roles/matrix-client-cinny/tasks/setup_install.yml

@@ -12,7 +12,7 @@
   when: "item.when | bool"
 
 - name: Ensure Cinny Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_cinny_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_client_cinny_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -54,7 +54,7 @@
   when: "item.src is not none"
 
 - name: Ensure Cinny Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_cinny_docker_image }}"
     source: build
     force_source: "{{ matrix_client_cinny_git_pull_results.changed }}"

roles/matrix-client-cinny/tasks/setup_uninstall.yml

@@ -30,6 +30,6 @@
     state: absent
 
 - name: Ensure Cinny Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_cinny_docker_image }}"
     state: absent

roles/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.10
+matrix_client_element_version: v1.11.12
 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') }}"

roles/matrix-client-element/tasks/setup_install.yml

@@ -13,7 +13,7 @@
   when: "item.when | bool"
 
 - name: Ensure Element Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_element_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_client_element_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -50,7 +50,7 @@
   when: "matrix_client_element_container_image_self_build | bool and matrix_client_element_container_image_self_build_low_memory_system_patch_enabled | bool"
 
 - name: Ensure Element Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_element_docker_image }}"
     source: build
     force_source: "{{ matrix_client_element_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-client-element/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure Element Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_element_docker_image }}"
     state: absent

roles/matrix-client-hydrogen/tasks/setup_install.yml

@@ -13,7 +13,7 @@
   when: "item.when | bool"
 
 - name: Ensure Hydrogen Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_hydrogen_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_client_hydrogen_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -58,7 +58,7 @@
 # This step MUST come after the steps to install the configuration files because the config files
 # are currently only read at build time, not at run time like most other components in the playbook
 - name: Ensure Hydrogen Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_hydrogen_docker_image }}"
     source: build
     force_source: "{{ matrix_client_hydrogen_git_pull_results.changed }}"

roles/matrix-client-hydrogen/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure Hydrogen Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_client_hydrogen_docker_image }}"
     state: absent

roles/matrix-conduit/tasks/conduit/setup_install.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure Conduit Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_conduit_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_conduit_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-conduit/tasks/conduit/setup_uninstall.yml

@@ -25,6 +25,6 @@
   when: "matrix_conduit_service_stat.stat.exists"
 
 - name: Ensure Conduit Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_conduit_docker_image }}"
     state: absent

roles/matrix-corporal/tasks/setup_corporal.yml

@@ -29,7 +29,7 @@
   when: "matrix_corporal_enabled | bool and matrix_corporal_container_image_self_build | bool"
 
 - name: Ensure Matrix Corporal Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_corporal_docker_image }}"
     source: build
     force_source: "{{ matrix_corporal_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -41,7 +41,7 @@
   when: "matrix_corporal_enabled | bool and matrix_corporal_container_image_self_build | bool"
 
 - name: Ensure Matrix Corporal Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_corporal_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_corporal_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -115,7 +115,7 @@
   when: "not matrix_corporal_enabled | bool"
 
 - name: Ensure Matrix Corporal Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_corporal_docker_image }}"
     state: absent
   when: "not matrix_corporal_enabled | bool"

roles/matrix-coturn/tasks/setup_install.yml

@@ -18,7 +18,7 @@
   when: "item.when | bool"
 
 - name: Ensure Coturn image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_coturn_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_coturn_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -42,7 +42,7 @@
       register: matrix_coturn_git_pull_results
 
     - name: Ensure Coturn Docker image is built
-      docker_image:
+      community.docker.docker_image:
         name: "{{ matrix_coturn_docker_image }}"
         source: build
         force_source: "{{ matrix_coturn_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -69,7 +69,7 @@
     group: "{{ matrix_user_groupname }}"
 
 - name: Ensure Coturn network is created in Docker
-  docker_network:
+  community.docker.docker_network:
     name: "{{ matrix_coturn_docker_network }}"
     driver: bridge
 

roles/matrix-dendrite/defaults/main.yml

@@ -6,7 +6,7 @@ matrix_dendrite_enabled: true
 
 matrix_dendrite_docker_image: "{{ matrix_dendrite_docker_image_name_prefix }}matrixdotorg/dendrite-monolith:{{ matrix_dendrite_docker_image_tag }}"
 matrix_dendrite_docker_image_name_prefix: "docker.io/"
-matrix_dendrite_docker_image_tag: "v0.10.3"
+matrix_dendrite_docker_image_tag: "v0.10.4"
 matrix_dendrite_docker_image_force_pull: "{{ matrix_dendrite_docker_image.endswith(':latest') }}"
 
 matrix_dendrite_base_path: "{{ matrix_base_data_path }}/dendrite"

roles/matrix-dendrite/tasks/dendrite/setup_install.yml

@@ -18,7 +18,7 @@
   when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
 
 - name: Ensure Dendrite Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dendrite_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_dendrite_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-dendrite/tasks/dendrite/setup_uninstall.yml

@@ -25,6 +25,6 @@
   when: "matrix_dendrite_service_stat.stat.exists"
 
 - name: Ensure Dendrite Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dendrite_docker_image }}"
     state: absent

roles/matrix-dimension/tasks/setup_install.yml

@@ -87,7 +87,7 @@
     group: "{{ matrix_dimension_user_gid }}"
 
 - name: Ensure Dimension image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dimension_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_dimension_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -110,7 +110,7 @@
   register: matrix_dimension_git_pull_results
 
 - name: Ensure Dimension Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dimension_docker_image }}"
     source: build
     force_source: "{{ matrix_dimension_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-dimension/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure Dimension Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dimension_docker_image }}"
     state: absent

roles/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.9.1-ls100
+matrix_dynamic_dns_version: v3.10.0-ls102
 
 # 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 }}"

roles/matrix-dynamic-dns/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Ensure Dynamic DNS image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dynamic_dns_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_dynamic_dns_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -37,7 +37,7 @@
   when: "matrix_dynamic_dns_enabled | bool and matrix_dynamic_dns_container_image_self_build | bool"
 
 - name: Ensure Dynamic DNS Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_dynamic_dns_docker_image }}"
     source: build
     force_source: "{{ matrix_dynamic_dns_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-email2matrix/tasks/setup_install.yml

@@ -22,7 +22,7 @@
     mode: 0640
 
 - name: Ensure Email2Matrix image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_email2matrix_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_email2matrix_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@@ -45,7 +45,7 @@
   when: "matrix_email2matrix_container_image_self_build | bool"
 
 - name: Ensure Email2Matrix Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_email2matrix_docker_image }}"
     source: build
     force_source: "{{ matrix_email2matrix_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-email2matrix/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure Email2Matrix Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_email2matrix_docker_image }}"
     state: absent

roles/matrix-etherpad/tasks/setup_install.yml

@@ -17,7 +17,7 @@
     group: "{{ matrix_etherpad_user_gid }}"
 
 - name: Ensure Etherpad image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_etherpad_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_etherpad_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-etherpad/tasks/setup_uninstall.yml

@@ -31,6 +31,6 @@
     state: absent
 
 - name: Ensure Etherpad Docker image doesn't exist
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_etherpad_docker_image }}"
     state: absent

roles/matrix-grafana/defaults/main.yml

@@ -5,7 +5,7 @@
 
 matrix_grafana_enabled: true
 
-matrix_grafana_version: 9.2.1
+matrix_grafana_version: 9.2.2
 matrix_grafana_docker_image: "{{ matrix_container_global_registry_prefix }}grafana/grafana:{{ matrix_grafana_version }}"
 matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"
 

roles/matrix-grafana/tasks/setup.yml

@@ -5,7 +5,7 @@
 #
 
 - name: Ensure matrix-grafana image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_grafana_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_grafana_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-jitsi/tasks/setup_jitsi_jicofo.yml

@@ -17,7 +17,7 @@
   when: matrix_jitsi_enabled | bool and item.when
 
 - name: Ensure jitsi-jicofo Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_jitsi_jicofo_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_jitsi_jicofo_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-jitsi/tasks/setup_jitsi_jvb.yml

@@ -17,7 +17,7 @@
   when: matrix_jitsi_enabled | bool and item.when
 
 - name: Ensure jitsi-jvb Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_jitsi_jvb_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_jitsi_jvb_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-jitsi/tasks/setup_jitsi_prosody.yml

@@ -18,7 +18,7 @@
   when: matrix_jitsi_enabled | bool and item.when
 
 - name: Ensure jitsi-prosody Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_jitsi_prosody_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_jitsi_prosody_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

roles/matrix-jitsi/tasks/setup_jitsi_web.yml

@@ -19,7 +19,7 @@
   when: matrix_jitsi_enabled | bool and item.when
 
 - name: Ensure jitsi-web Docker image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_jitsi_web_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_jitsi_web_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"