Merge branch 'spantaleev:master' into mautrix-discord-restricted-rooms-config

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/defaults/main.yml

@@ -284,6 +284,11 @@ matrix_docker_installation_enabled: true
 # Possible values are "docker-ce" (default) and "docker.io" (Debian).
 matrix_docker_package_name: docker-ce
 
+# Controls whether the current playbook's commit hash is saved in `git_hash.yml` on the target
+# Set this to false if GIT is not installed on the local system (the system where the ansible command is run on)
+# to suppress the warning message.
+matrix_playbook_commit_hash_preservation_enabled: true
+
 # Variables to Control which parts of our roles run.
 run_postgres_import: true
 run_postgres_upgrade: true

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

@@ -19,8 +19,54 @@
     mode: '0660'
   when: "matrix_vars_yml_snapshotting_enabled | bool"
 
+- name: Save current git-repo status on the target to aid with restoring in case of problems
+  when: "matrix_playbook_commit_hash_preservation_enabled|bool"
+  block:
+    - name: Get local git hash  # noqa command-instead-of-module
+      delegate_to: 127.0.0.1
+      become: false
+      register: git_describe
+      changed_when: false
+      ansible.builtin.shell:
+        git describe
+            --always
+            --tags
+            --dirty
+            --long
+            --all
+
+    - ansible.builtin.set_fact:
+        git_hash: "{{ git_describe.stdout }}"
+
+    - name: Git hash
+      ansible.builtin.debug:
+        msg: "Git hash: {{ git_hash }}"
+
+    - name: Save git_hash.yml on target
+      ansible.builtin.copy:
+        content: "{{ git_hash }}"
+        dest: "{{ matrix_base_data_path }}/git_hash.yml"
+        owner: "{{ matrix_user_username }}"
+        group: "{{ matrix_user_groupname }}"
+        mode: '0660'
+
+  rescue:
+    - name: GIT not found error
+      ansible.builtin.debug:
+        msg: >-
+          Couldn't find GIT on the local machine. Continuing without saving the GIT hash.
+          You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
+      when: "git_describe.stderr.find('git: not found') != -1"
+
+    - name: Get GIT hash error
+      ansible.builtin.fail:
+        msg: >-
+          Error when trying to get the GIT hash. Please consult the error message above.
+          You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
+      when: "git_describe.stderr.find('git: not found') == -1"
+
 - 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.5
+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/init.yml

@@ -85,7 +85,7 @@
     msg: >-
       NOTE: You've enabled the Matrix Slack bridge but are not using the matrix-nginx-proxy
       reverse proxy.
-      Please make sure that you're proxying the `{{ something }}`
+      Please make sure that you're proxying the `{{ matrix_appservice_slack_public_endpoint }}`
       URL endpoint to the matrix-appservice-slack container.
       You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
   when: "matrix_appservice_slack_enabled | bool and not matrix_nginx_proxy_enabled | default(False) | bool"

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 }}"
@@ -128,9 +128,9 @@ matrix_hookshot_generic_allow_js_transformation_functions: false
 matrix_hookshot_generic_user_id_prefix: '_webhooks_'
 
 
-matrix_hookshot_feeds_enabled: false
-# polling interval in seconds
-matrix_hookshot_feeds_interval: 600
+matrix_hookshot_feeds_enabled: true
+matrix_hookshot_feeds_pollIntervalSeconds: 600  # no-qa var-naming
+matrix_hookshot_feeds_pollTimeoutSeconds: 10  # no-qa var-naming
 
 
 # There is no need to edit ports. use matrix_hookshot_container_http_host_bind_ports below to expose ports instead.

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-hookshot/tasks/validate_config.yml

@@ -58,6 +58,15 @@
   with_items:
     - "matrix_hookshot_provisioning_secret"
 
+- name: (Deprecation) Catch and report renamed Hookshot variables
+  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_hookshot_feeds_interval', 'new': 'matrix_hookshot_feeds_pollIntervalSeconds'}
+
 - name: (Deprecation) Catch and report old metrics usage
   ansible.builtin.fail:
     msg: >-

roles/matrix-bridge-hookshot/templates/config.yml.j2

@@ -82,8 +82,9 @@ generic:
 feeds:
   # (Optional) Configure this to enable RSS/Atom feed support
   #
-  enabled: {{ matrix_hookshot_feeds_enabled }}
-  pollIntervalSeconds: {{ matrix_hookshot_feeds_interval }}
+  enabled: {{ matrix_hookshot_feeds_enabled | to_json }}
+  pollIntervalSeconds: {{ matrix_hookshot_feeds_pollIntervalSeconds | to_json }}
+  pollTimeoutSeconds: {{ matrix_hookshot_feeds_pollTimeoutSeconds | to_json }}
 {% endif %}
 {% if matrix_hookshot_provisioning_enabled %}
 provisioning:
@@ -108,7 +109,7 @@ metrics:
 logging:
   # (Optional) Logging settings. You can have a severity debug,info,warn,error
   #
-  level: info
+  level: warn
 {% if matrix_hookshot_widgets_enabled %}
 widgets:
   # (Optional) EXPERIMENTAL support for complimentary widgets

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/defaults/main.yml

@@ -8,7 +8,7 @@ matrix_mautrix_instagram_container_image_self_build: false
 matrix_mautrix_instagram_container_image_self_build_repo: "https://github.com/mautrix/instagram.git"
 matrix_mautrix_instagram_container_image_self_build_repo_version: "{{ 'master' if matrix_mautrix_instagram_version == 'latest' else matrix_mautrix_instagram_version }}"
 
-matrix_mautrix_instagram_version: v0.2.1
+matrix_mautrix_instagram_version: v0.2.2
 # See: https://mau.dev/tulir/mautrix-instagram/container_registry
 matrix_mautrix_instagram_docker_image: "{{ matrix_mautrix_instagram_docker_image_name_prefix }}mautrix/instagram:{{ matrix_mautrix_instagram_version }}"
 matrix_mautrix_instagram_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_instagram_container_image_self_build else 'dock.mau.dev/' }}"

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/defaults/main.yml

@@ -38,6 +38,9 @@ matrix_mautrix_telegram_api_id: ''
 matrix_mautrix_telegram_api_hash: ''
 matrix_mautrix_telegram_bot_token: disabled
 
+# Define the filter-mode
+matrix_mautrix_telegram_filter_mode: "blacklist"
+
 # Whether or not the public-facing endpoints should be enabled (web-based login)
 matrix_mautrix_telegram_appservice_public_enabled: true
 

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-telegram/templates/config.yaml.j2

@@ -273,12 +273,12 @@ bridge:
         # Filter mode to use. Either "blacklist" or "whitelist".
         # If the mode is "blacklist", the listed chats will never be bridged.
         # If the mode is "whitelist", only the listed chats can be bridged.
-        mode: blacklist
+        mode: {{ matrix_mautrix_telegram_filter_mode | to_json }}
         # The list of group/channel IDs to filter.
         list: []
 
     # The prefix for commands. Only required in non-management rooms.
-    command_prefix: "{{ matrix_mautrix_telegram_command_prefix }}"
+    command_prefix: {{ matrix_mautrix_telegram_command_prefix | to_json }}
 
     # Permissions for using the bridge.
     # Permitted values:
@@ -291,7 +291,7 @@ bridge:
     #        * - All Matrix users
     #   domain - All users on that homeserver
     #     mxid - Specific user
-    permissions: {{ matrix_mautrix_telegram_bridge_permissions|to_json }}
+    permissions: {{ matrix_mautrix_telegram_bridge_permissions | to_json }}
 
     # Options related to the message relay Telegram bot.
     relaybot:

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/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.7.0
+matrix_mautrix_whatsapp_version: v0.7.1
 # 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/' }}"

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-mautrix-whatsapp/templates/config.yaml.j2

@@ -147,6 +147,12 @@ bridge:
         # provisioning endpoint is used or when a message comes in from that
         # chat.
         max_initial_conversations: -1
+        # If this value is greater than 0, then if the conversation's last
+        # message was more than this number of hours ago, then the conversation
+        # will automatically be marked it as read.
+        # Conversations that have a last message that is less than this number
+        # of hours ago will have their unread status synced from WhatsApp.
+        unread_hours_threshold: 0
         # Settings for immediate backfills. These backfills should generally be
         # small and their main purpose is to populate each of the initial chats
         # (as configured by max_initial_conversations) with a few messages so
@@ -228,7 +234,10 @@ bridge:
     # manually.
     login_shared_secret_map: {{ matrix_mautrix_whatsapp_bridge_login_shared_secret_map|to_json }}
     # Should the bridge explicitly set the avatar and room name for private chat portal rooms?
+    # This is implicitly enabled in encrypted rooms.
     private_chat_portal_meta: false
+    # Should group members be synced in parallel? This makes member sync faster
+    parallel_member_sync: false
     # Should Matrix m.notice-type messages be bridged?
     bridge_notices: true
     # Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
@@ -281,6 +290,9 @@ bridge:
     # Send captions in the same message as images. This will send data compatible with both MSC2530 and MSC3552.
     # This is currently not supported in most clients.
     caption_in_message: false
+    # Should Matrix edits be bridged to WhatsApp edits?
+    # Official WhatsApp clients don't render edits yet, but once they do, the bridge should work with them right away.
+    send_whatsapp_edits: false
     # Maximum time for handling Matrix events. Duration strings formatted for https://pkg.go.dev/time#ParseDuration
     # Null means there's no enforced timeout.
     message_handling_timeout:

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.8
+matrix_client_element_version: v1.11.13
 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.2"
+matrix_dendrite_docker_image_tag: "v0.10.6"
 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-ls103
 
 # 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.1.7
+matrix_grafana_version: 9.2.3
 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 }}"

roles/matrix-ldap-registration-proxy/tasks/init.yml

@@ -10,7 +10,10 @@
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-ldap-registration-proxy.service'] }}"
   when: matrix_ldap_registration_proxy_enabled | bool
 
-- block:
+- when: matrix_ldap_registration_proxy_enabled | bool
+  tags:
+    - always
+  block:
     - name: Fail if matrix-nginx-proxy role already executed
       ansible.builtin.fail:
         msg: >-
@@ -52,7 +55,3 @@
           URL endpoint to the matrix-ldap-proxy container.
           You can expose the container's port using the `matrix_ldap_registration_proxy_container_http_host_bind_port` variable.
       when: "not matrix_nginx_proxy_enabled | default(False) | bool"
-
-  tags:
-    - always
-  when: matrix_ldap_registration_proxy_enabled | bool

roles/matrix-ldap-registration-proxy/tasks/setup_install.yml

@@ -26,7 +26,7 @@
   register: matrix_ldap_registration_proxy_git_pull_results
 
 - name: Ensure matrix_ldap_registration_proxy Docker image is built
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_ldap_registration_proxy_docker_image }}"
     source: build
     force_source: "{{ matrix_ldap_registration_proxy_git_pull_results.changed }}"

roles/matrix-ldap-registration-proxy/tasks/setup_uninstall.yml

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