Merge branch 'master' into element-call-integration

roles/custom/matrix-alertmanager-receiver/defaults/main.yml

@@ -6,7 +6,7 @@
 matrix_alertmanager_receiver_enabled: true
 
 # renovate: datasource=docker depName=docker.io/metio/matrix-alertmanager-receiver
-matrix_alertmanager_receiver_version: 2024.10.2
+matrix_alertmanager_receiver_version: 2024.11.20
 
 matrix_alertmanager_receiver_scheme: https
 
@@ -41,7 +41,7 @@ matrix_alertmanager_receiver_container_additional_networks_default: []
 matrix_alertmanager_receiver_container_additional_networks_auto: []
 matrix_alertmanager_receiver_container_additional_networks_custom: []
 
-# Controls whether matrix-alertmanager-receiver metrics should be proxied (exposed) on `matrix.DOMAIN/metrics/matrix-alertmanager-receiver`
+# Controls whether matrix-alertmanager-receiver metrics should be proxied (exposed) on `matrix.example.com/metrics/matrix-alertmanager-receiver`
 matrix_alertmanager_receiver_metrics_proxying_enabled: false
 matrix_alertmanager_receiver_metrics_proxying_hostname: ''
 matrix_alertmanager_receiver_metrics_proxying_path: /metrics/matrix-alertmanager-receiver
@@ -127,8 +127,8 @@ matrix_alertmanager_receiver_config_matrix_access_token: ''
 #
 # Example:
 # matrix_alertmanager_receiver_config_matrix_room:
-#   simple-name: "!qohfwef7qwerf:example.com"
-#   another-name: "!bf3zfio3wbanw:example.com"
+#   simple-name: "!qporfwt:example.com"
+#   another-name: "!aaabaa:example.com"
 matrix_alertmanager_receiver_config_matrix_room_mapping: {}
 
 # Controls the `templating.external-url-mapping` configuration setting.

roles/custom/matrix-appservice-draupnir-for-all/defaults/main.yml

@@ -40,7 +40,7 @@ matrix_appservice_draupnir_for_all_systemd_wanted_services_list: []
 # The room ID where people can use the bot. The bot has no access controls, so
 # anyone in this room can use the bot - secure your room!
 # This should be a room alias - not a matrix.to URL.
-# Note: draupnir is fairly verbose - expect a lot of messages from it.
+# Note: Draupnir is fairly verbose - expect a lot of messages from it.
 # This room is diffrent for Appservice Mode compared to normal mode.
 # In Appservice mode it provides functions like user management.
 matrix_appservice_draupnir_for_all_master_control_room_alias: ""

roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml

@@ -17,7 +17,7 @@
     - {path: "{{ matrix_appservice_draupnir_for_all_docker_src_files_path }}", when: "{{ matrix_appservice_draupnir_for_all_container_image_self_build }}"}
   when: "item.when | bool"
 
-- name: Ensure draupnir Docker image is pulled
+- name: Ensure Draupnir Docker image is pulled
   community.docker.docker_image:
     name: "{{ matrix_appservice_draupnir_for_all_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -29,7 +29,7 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure draupnir repository is present on self-build
+- name: Ensure Draupnir repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_appservice_draupnir_for_all_container_image_self_build_repo }}"
     dest: "{{ matrix_appservice_draupnir_for_all_docker_src_files_path }}"
@@ -40,7 +40,7 @@
   register: matrix_appservice_draupnir_for_all_git_pull_results
   when: "matrix_appservice_draupnir_for_all_container_image_self_build | bool"
 
-- name: Ensure draupnir Docker image is built
+- name: Ensure Draupnir Docker image is built
   community.docker.docker_image:
     name: "{{ matrix_appservice_draupnir_for_all_docker_image }}"
     source: build

roles/custom/matrix-appservice-draupnir-for-all/templates/production-appservice.yaml.j2

@@ -1,5 +1,5 @@
 homeserver:
-  # The Matrix server name, this will be the name of the server in your matrix id.
+  # The Matrix server name, this will be the name of the server in your Matrix ID.
   domain: "{{ matrix_domain }}"
   # The url for the appservice to call the client server API from.
   url: "{{ matrix_homeserver_url }}"
@@ -15,4 +15,4 @@ adminRoom: "{{ matrix_appservice_draupnir_for_all_master_control_room_alias }}"
 
 # This is a web api that the widget connects to in order to interact with the appservice.
 webAPI:
-  port: 9000
+  port: 9000

roles/custom/matrix-authentication-service/defaults/main.yml

@@ -0,0 +1,602 @@
+---
+
+# matrix-authentication-service (MAS) is an OAuth 2.0 and OpenID Provider server for Matrix.
+# Project source code URL: https://github.com/element-hq/matrix-authentication-service
+
+matrix_authentication_service_enabled: true
+
+matrix_authentication_service_hostname: ''
+
+# Controls the path prefix for the authentication service.
+# This value must either be `/` or not end with a slash (e.g. `/auth`).
+matrix_authentication_service_path_prefix: /
+
+matrix_authentication_service_container_image_self_build: false
+matrix_authentication_service_container_repo: "https://github.com/element-hq/matrix-authentication-service.git"
+matrix_authentication_service_container_repo_version: "{{ 'main' if matrix_authentication_service_version == 'latest' else ('v' + matrix_authentication_service_version) }}"
+matrix_authentication_service_container_src_files_path: "{{ matrix_base_data_path }}/matrix-authentication-service/container-src"
+
+# renovate: datasource=docker depName=ghcr.io/element-hq/matrix-authentication-service
+matrix_authentication_service_version: 0.12.0
+matrix_authentication_service_container_image: "{{ matrix_authentication_service_container_image_name_prefix }}element-hq/matrix-authentication-service:{{ matrix_authentication_service_version }}"
+matrix_authentication_service_container_image_name_prefix: "{{ 'localhost/' if matrix_authentication_service_container_image_self_build else 'ghcr.io/' }}"
+matrix_authentication_service_container_image_force_pull: "{{ matrix_authentication_service_container_image.endswith(':latest') }}"
+
+matrix_authentication_service_base_path: "{{ matrix_base_data_path }}/matrix-authentication-service"
+matrix_authentication_service_bin_path: "{{ matrix_authentication_service_base_path }}/bin"
+matrix_authentication_service_config_path: "{{ matrix_authentication_service_base_path }}/config"
+matrix_authentication_service_data_path: "{{ matrix_authentication_service_base_path }}/data"
+matrix_authentication_service_data_keys_path: "{{ matrix_authentication_service_data_path }}/keys"
+
+matrix_authentication_service_uid: "{{ matrix_user_uid }}"
+matrix_authentication_service_gid: "{{ matrix_user_gid }}"
+
+matrix_authentication_service_container_network: ""
+
+matrix_authentication_service_container_additional_networks: "{{ matrix_authentication_service_container_additional_networks_auto + matrix_authentication_service_container_additional_networks_custom }}"
+matrix_authentication_service_container_additional_networks_auto: []
+matrix_authentication_service_container_additional_networks_custom: []
+
+# A list of extra arguments to pass to the container
+matrix_authentication_service_container_extra_arguments: []
+
+# List of systemd services that matrix-authentication-service.service depends on
+matrix_authentication_service_systemd_required_services_list: "{{ matrix_authentication_service_systemd_required_services_list_default + matrix_authentication_service_systemd_required_services_list_auto + matrix_authentication_service_systemd_required_services_list_custom }}"
+matrix_authentication_service_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
+matrix_authentication_service_systemd_required_services_list_auto: []
+matrix_authentication_service_systemd_required_services_list_custom: []
+
+# List of systemd services that matrix-authentication-service.service wants
+matrix_authentication_service_systemd_wanted_services_list: "{{ matrix_authentication_service_systemd_wanted_services_list_auto + matrix_authentication_service_systemd_wanted_services_list_custom }}"
+matrix_authentication_service_systemd_wanted_services_list_auto: []
+matrix_authentication_service_systemd_wanted_services_list_custom: []
+
+########################################################################################
+#                                                                                      #
+# Key management                                                                       #
+#                                                                                      #
+########################################################################################
+
+# Controls whether the playbook will manage the secrets keys for you.
+#
+# See:
+# - matrix_authentication_service_config_secrets_keys
+# - matrix_authentication_service_key_management_*
+matrix_authentication_service_key_management_enabled: true
+
+matrix_authentication_service_key_management_list: "{{ matrix_authentication_service_key_management_list_default + matrix_authentication_service_key_management_list_custom }}"
+matrix_authentication_service_key_management_list_default: |-
+  {{
+    (
+      ([
+        {
+          "config": {
+            "kid": matrix_authentication_service_key_management_rsa_2048_key_id,
+            "key_file": ("/keys/" + matrix_authentication_service_key_management_rsa_2048_key_file),
+          },
+          "key_file": matrix_authentication_service_key_management_rsa_2048_key_file,
+          "generation_command": matrix_authentication_service_key_management_rsa_2048_generation_command,
+        }
+      ] if matrix_authentication_service_key_management_rsa_2048_enabled else [])
+      +
+      ([
+        {
+          "config": {
+            "kid": matrix_authentication_service_key_management_ecdsa_p256_key_id,
+            "key_file": ("/keys/" + matrix_authentication_service_key_management_ecdsa_p256_key_file),
+          },
+          "key_file": matrix_authentication_service_key_management_ecdsa_p256_key_file,
+          "generation_command": matrix_authentication_service_key_management_ecdsa_p256_generation_command,
+        }
+      ] if matrix_authentication_service_key_management_ecdsa_p256_enabled else [])
+      +
+      ([
+        {
+          "config": {
+            "kid": matrix_authentication_service_key_management_ecdsa_p384_key_id,
+            "key_file": ("/keys/" + matrix_authentication_service_key_management_ecdsa_p384_key_file),
+          },
+          "key_file": matrix_authentication_service_key_management_ecdsa_p384_key_file,
+          "generation_command": matrix_authentication_service_key_management_ecdsa_p384_generation_command,
+        }
+      ] if matrix_authentication_service_key_management_ecdsa_p384_enabled else [])
+      +
+      ([
+        {
+          "config": {
+            "kid": matrix_authentication_service_key_management_ecdsa_k256_key_id,
+            "key_file": ("/keys/" + matrix_authentication_service_key_management_ecdsa_k256_key_file),
+          },
+          "key_file": matrix_authentication_service_key_management_ecdsa_k256_key_file,
+          "generation_command": matrix_authentication_service_key_management_ecdsa_k256_generation_command,
+        }
+      ] if matrix_authentication_service_key_management_ecdsa_k256_enabled else [])
+    )
+    if matrix_authentication_service_key_management_enabled
+    else []
+  }}
+matrix_authentication_service_key_management_list_custom: []
+
+matrix_authentication_service_key_management_rsa_2048_enabled: true
+matrix_authentication_service_key_management_rsa_2048_key_id: default-rsa
+matrix_authentication_service_key_management_rsa_2048_key_file: rsa-2048.priv.pem
+matrix_authentication_service_key_management_rsa_2048_generation_command: "openssl genpkey -algorithm RSA -out __KEY_FILE_PATH__ -pkeyopt rsa_keygen_bits:2048"
+
+matrix_authentication_service_key_management_ecdsa_p256_enabled: true
+matrix_authentication_service_key_management_ecdsa_p256_key_id: default-ecdsa-p256
+matrix_authentication_service_key_management_ecdsa_p256_key_file: ecdsa-p256.priv.pem
+matrix_authentication_service_key_management_ecdsa_p256_generation_command: "openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:prime256v1 -out __KEY_FILE_PATH__ -outform PEM"
+matrix_authentication_service_key_management_ecdsa_p384_enabled: true
+matrix_authentication_service_key_management_ecdsa_p384_key_id: default-ecdsa-p384
+matrix_authentication_service_key_management_ecdsa_p384_key_file: ecdsa-p384.priv.pem
+matrix_authentication_service_key_management_ecdsa_p384_generation_command: "openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:secp384r1 -out __KEY_FILE_PATH__ -outform PEM"
+
+matrix_authentication_service_key_management_ecdsa_k256_enabled: true
+matrix_authentication_service_key_management_ecdsa_k256_key_id: default-ecdsa-k256
+matrix_authentication_service_key_management_ecdsa_k256_key_file: ecdsa-k256.priv.pem
+matrix_authentication_service_key_management_ecdsa_k256_generation_command: "openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:secp256k1 -out __KEY_FILE_PATH__ -outform PEM"
+
+########################################################################################
+#                                                                                      #
+# /Key management                                                                      #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Email configuration                                                                  #
+#                                                                                      #
+########################################################################################
+
+# Controls the `email.from` configuration setting.
+matrix_authentication_service_config_email_from: '"{{ matrix_authentication_service_config_email_from_name }}" <{{ matrix_authentication_service_config_email_from_address }}>'
+matrix_authentication_service_config_email_from_name: 'Matrix Authentication Service'
+matrix_authentication_service_config_email_from_address: "matrix@{{ matrix_domain }}"
+
+# Controls the `email.reply_to` configuration setting.
+matrix_authentication_service_config_email_reply_to: '"{{ matrix_authentication_service_config_email_reply_to_name }}" <{{ matrix_authentication_service_config_email_reply_to_address }}>'
+matrix_authentication_service_config_email_reply_to_name: "{{ matrix_authentication_service_config_email_from_name }}"
+matrix_authentication_service_config_email_reply_to_address: "{{ matrix_authentication_service_config_email_from_address }}"
+
+# Controls the `email.transport` configuration setting.
+#
+# Valid options are: blackhole, smtp, aws_ses
+# Upstream reports that `sendmail` is supported as well,
+# but this is not true when running it in a container image due to the `sendmail` binary not being included.
+matrix_authentication_service_config_email_transport: blackhole
+
+# Controls the `email.mode` configuration setting for SMTP.
+# Options are 'plain', 'tls', or 'starttls'.
+matrix_authentication_service_config_email_mode: plain
+
+# Controls the `email.hostname` configuration setting for SMTP.
+matrix_authentication_service_config_email_hostname: ""
+
+# Controls the `email.port` configuration setting for SMTP.
+matrix_authentication_service_config_email_port: 587
+
+# Controls the `email.username` configuration setting for SMTP.
+matrix_authentication_service_config_email_username: ""
+
+# Controls the `email.password` configuration setting for SMTP.
+matrix_authentication_service_config_email_password: ""
+
+########################################################################################
+#                                                                                      #
+# /Email configuration                                                                 #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Account configuration                                                                #
+#                                                                                      #
+########################################################################################
+
+# Controls the `account.email_change_allowed` configuration setting.
+#
+# Whether users are allowed to change their email addresses.
+matrix_authentication_service_config_account_email_change_allowed: true
+
+# Controls the `account.displayname_change_allowed` configuration setting.
+#
+# Whether users are allowed to change their display names.
+# This should be in sync with the policy in the homeserver configuration.
+matrix_authentication_service_config_account_displayname_change_allowed: true
+
+# Controls the `account.password_registration_enabled` configuration setting.
+#
+# Whether to enable self-service password registration.
+# This has no effect if password login is disabled.
+matrix_authentication_service_config_account_password_registration_enabled: false
+
+# Controls the `account.password_change_allowed` configuration setting.
+#
+# Whether users are allowed to change their passwords.
+# This has no effect if password login is disabled.
+matrix_authentication_service_config_account_password_change_allowed: true
+
+# Controls the `account.password_recovery_enabled` configuration setting.
+#
+# Whether email-based password recovery is enabled
+# This has no effect if password login is disabled.
+matrix_authentication_service_config_account_password_recovery_enabled: false
+
+########################################################################################
+#                                                                                      #
+# /Account configuration                                                               #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Database configuration                                                               #
+#                                                                                      #
+########################################################################################
+
+# Controls the `database.username` configuration setting.
+matrix_authentication_service_config_database_username: 'matrix_authentication_service'
+
+# Controls the `database.password` configuration setting.
+matrix_authentication_service_config_database_password: ''
+
+# Controls the `database.host` configuration setting.
+matrix_authentication_service_config_database_host: ''
+
+# Controls the `database.port` configuration setting.
+matrix_authentication_service_config_database_port: 5432
+
+# Controls the `database.database` configuration setting.
+matrix_authentication_service_config_database_database: 'matrix_authentication_service'
+
+# Controls the `database.ssl_mode` configuration setting.
+matrix_authentication_service_config_database_ssl_mode: disable
+
+# Controls the `database.max_connections` configuration setting.
+matrix_authentication_service_config_database_max_connections: 10
+
+# Controls the `database.min_connections` configuration setting.
+matrix_authentication_service_config_database_min_connections: 0
+
+# Controls the `database.connect_timeout` configuration setting.
+matrix_authentication_service_config_database_connect_timeout: 30
+
+# Controls the `database.idle_timeout` configuration setting.
+matrix_authentication_service_config_database_idle_timeout: 600
+
+# Controls the `database.max_lifetime` configuration setting.
+matrix_authentication_service_config_database_max_lifetime: 1800
+
+########################################################################################
+#                                                                                      #
+# /Database configuration                                                              #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Secrets configuration                                                                #
+#                                                                                      #
+########################################################################################
+
+# Controls the `secrets.encryption` configuration setting.
+matrix_authentication_service_config_secrets_encryption: ''
+
+# Controls the `secrets.keys` configuration setting.
+matrix_authentication_service_config_secrets_keys: |-
+  {{
+    matrix_authentication_service_key_management_list | map(attribute='config') | list
+    if matrix_authentication_service_key_management_enabled
+    else []
+  }}
+
+########################################################################################
+#                                                                                      #
+# /Secrets configuration                                                               #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# HTTP configuration                                                                 #
+#                                                                                      #
+########################################################################################
+
+# Controls the `http.public_base` configuration setting.
+matrix_authentication_service_config_http_public_base: "https://{{ matrix_authentication_service_hostname }}{{ '/' if matrix_authentication_service_path_prefix == '/' else (matrix_authentication_service_path_prefix + '/') }}"
+
+# Controls the `http.issuer` configuration setting.
+matrix_authentication_service_config_http_issuer: "{{ matrix_authentication_service_config_http_public_base }}"
+
+# Controls the `http.trusted_proxies` configuration setting.
+matrix_authentication_service_config_http_trusted_proxies:
+  - 192.168.0.0/16
+  - 172.16.0.0/12
+  - 10.0.0.0/10
+  - 127.0.0.1/8
+  - fd00::/8
+  - ::1/128
+
+########################################################################################
+#                                                                                      #
+# /HTTP configuration                                                                  #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Matrix configuration                                                                 #
+#                                                                                      #
+########################################################################################
+
+# Controls the `matrix.homeserver` configuration setting.
+# The homeserver name, as per the `server_name` in the Synapse configuration file.
+matrix_authentication_service_config_matrix_homeserver: ""
+
+# Controls the `matrix.endpoint` configuration setting.
+# URL to which the homeserver is accessible from the service
+matrix_authentication_service_config_matrix_endpoint: ""
+
+# Controls the `matrix.secret` configuration setting.
+matrix_authentication_service_config_matrix_secret: ""
+
+########################################################################################
+#                                                                                      #
+# /Matrix configuration                                                                #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Passwords configuration                                                              #
+#                                                                                      #
+########################################################################################
+
+# Controls the `passwords.enabled` configuration setting.
+# Whether to enable the password database.
+# If disabled, users will only be able to log in using upstream OIDC providers
+matrix_authentication_service_config_passwords_enabled: true
+
+# Controls the `passwords.schemes` configuration setting.
+# List of password hashing schemes being used.
+# Only change this if you know what you're doing
+matrix_authentication_service_config_passwords_schemes:
+  - version: 1
+    algorithm: argon2id
+
+# Controls the `passwords.minimum_complexity` configuration setting.
+# Minimum complexity required for passwords, estimated by the zxcvbn algorithm
+# Must be between 0 and 4, default is 3
+# See https://github.com/dropbox/zxcvbn#usage for more information
+matrix_authentication_service_config_passwords_minimum_complexity: 3
+
+########################################################################################
+#                                                                                      #
+# /Passwords configuration                                                             #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Clients configuration                                                                #
+#                                                                                      #
+########################################################################################
+
+# Controls the `clients` configuration setting.
+# List of clients to be used by the authentication service.
+#
+# See:
+# - https://element-hq.github.io/matrix-authentication-service/reference/configuration.html#clients
+# - https://element-hq.github.io/matrix-authentication-service/setup/homeserver.html#provision-a-client-for-the-homeserver-to-use
+#
+# To define your own, use `matrix_authentication_service_config_clients_custom`.
+matrix_authentication_service_config_clients: "{{ matrix_authentication_service_config_clients_auto + matrix_authentication_service_config_clients_custom }}"
+matrix_authentication_service_config_clients_auto: []
+matrix_authentication_service_config_clients_custom: []
+
+########################################################################################
+#                                                                                      #
+# /Clients configuration                                                               #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Upstream OAuth2 configuration                                                        #
+#                                                                                      #
+########################################################################################
+
+# Controls the `upstream_oauth2.providers` configuration setting.
+# See:
+# - https://element-hq.github.io/matrix-authentication-service/reference/configuration.html#upstream_oauth2providers
+matrix_authentication_service_config_upstream_oauth2_providers: []
+
+########################################################################################
+#                                                                                      #
+# /Upstream OAuth2 configuration                                                       #
+#                                                                                      #
+########################################################################################
+
+
+# Holds the final Matrix Authentication Service configuration (a combination of the default and its extension).
+# You most likely don't need to touch this variable. Instead, see `matrix_authentication_service_configuration_yaml` or `matrix_authentication_service_configuration_extension_yaml`.
+matrix_authentication_service_configuration: "{{ matrix_authentication_service_configuration_yaml | from_yaml | combine(matrix_authentication_service_configuration_extension, recursive=True) }}"
+
+# Default Matrix Authentication Service configuration template which covers the generic use case.
+# You can customize it by controlling the various variables inside it.
+#
+# For a more advanced customization, you can extend the default (see `matrix_authentication_service_configuration_extension_yaml`)
+# or completely replace this variable with your own template.
+matrix_authentication_service_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}"
+
+matrix_authentication_service_configuration_extension_yaml: |
+  # Your custom YAML configuration for Matrix Authentication Service goes here.
+  # This configuration extends the default starting configuration (`matrix_authentication_service_configuration_yaml`).
+  #
+  # You can override individual variables from the default configuration, or introduce new ones.
+  #
+  # If you need something more special, you can take full control by
+  # completely redefining `matrix_authentication_service_configuration_yaml`.
+  #
+  # Example configuration extension follows:
+  #
+  # user:
+  #   password: something
+
+matrix_authentication_service_configuration_extension: "{{ matrix_authentication_service_configuration_extension_yaml | from_yaml if matrix_authentication_service_configuration_extension_yaml | from_yaml is mapping else {} }}"
+
+# Additional environment variables to pass to the Matrix Authentication Service container.
+#
+# Environment variables take priority over settings in the configuration file.
+#
+# Example:
+# matrix_authentication_service_environment_variables_extension: |
+#   KEY=value
+matrix_authentication_service_environment_variables_extension: ''
+
+
+########################################################################################
+#                                                                                      #
+# Labels                                                                               #
+#                                                                                      #
+########################################################################################
+
+# matrix_authentication_service_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
+# See `../templates/labels.j2` for details.
+#
+# To inject your own other container labels, see `matrix_authentication_service_container_labels_additional_labels`.
+matrix_authentication_service_container_labels_traefik_enabled: true
+matrix_authentication_service_container_labels_traefik_docker_network: "{{ matrix_authentication_service_container_network }}"
+matrix_authentication_service_container_labels_traefik_entrypoints: web-secure
+matrix_authentication_service_container_labels_traefik_tls_certResolver: default  # noqa var-naming
+
+matrix_authentication_service_container_labels_public_main_hostname: "{{ matrix_authentication_service_hostname }}"
+# The path prefix must either be `/` or not end with a slash (e.g. `/auth`).
+matrix_authentication_service_container_labels_public_main_path_prefix: "{{ matrix_authentication_service_path_prefix }}"
+matrix_authentication_service_container_labels_public_main_rule: "Host(`{{ matrix_authentication_service_container_labels_public_main_hostname }}`){% if matrix_authentication_service_container_labels_public_main_path_prefix != '/' %} && PathPrefix(`{{ matrix_authentication_service_container_labels_public_main_path_prefix }}`){% endif %}"
+matrix_authentication_service_container_labels_public_main_priority: 0
+matrix_authentication_service_container_labels_public_main_entrypoints: "{{ matrix_authentication_service_container_labels_traefik_entrypoints }}"
+matrix_authentication_service_container_labels_public_main_tls: "{{ matrix_authentication_service_container_labels_public_main_entrypoints != 'web' }}"
+matrix_authentication_service_container_labels_public_main_tls_certResolver: "{{ matrix_authentication_service_container_labels_traefik_tls_certResolver }}"  # noqa var-naming
+
+# Controls whether labels will be added to expose the compatibility layer publicly.
+#
+# The service exposes a compatibility layer to allow legacy clients to authenticate using the service.
+# This works by exposing a few Matrix endpoints that should be proxied to the service.
+# The following Matrix Client-Server API endpoints need to be handled by the authentication service:
+# - /_matrix/client/*/login
+# - /_matrix/client/*/logout
+# - /_matrix/client/*/refresh
+#
+# See:
+# - https://element-hq.github.io/matrix-authentication-service/setup/homeserver.html#set-up-the-compatibility-layer
+# - https://element-hq.github.io/matrix-authentication-service/setup/reverse-proxy.html#compatibility-layer
+#
+# Regardless of whether this is enabled, it may or may not take effect due to the value of other variables.
+# See `matrix_authentication_service_container_labels_traefik_enabled`
+matrix_authentication_service_container_labels_public_compatibility_layer_enabled: false
+matrix_authentication_service_container_labels_public_compatibility_layer_hostname: ""
+matrix_authentication_service_container_labels_public_compatibility_layer_path_regexp: "^/_matrix/client/(?P<version>([^/]+))/(?P<endpoint>(login|logout|refresh))"
+matrix_authentication_service_container_labels_public_compatibility_layer_rule: "Host(`{{ matrix_authentication_service_container_labels_public_compatibility_layer_hostname }}`) && PathRegexp(`{{ matrix_authentication_service_container_labels_public_compatibility_layer_path_regexp }}`)"
+matrix_authentication_service_container_labels_public_compatibility_layer_priority: 0
+matrix_authentication_service_container_labels_public_compatibility_layer_entrypoints: "{{ matrix_authentication_service_container_labels_traefik_entrypoints }}"
+matrix_authentication_service_container_labels_public_compatibility_layer_tls: "{{ matrix_authentication_service_container_labels_public_compatibility_layer_entrypoints != 'web' }}"
+matrix_authentication_service_container_labels_public_compatibility_layer_tls_certResolver: "{{ matrix_authentication_service_container_labels_traefik_tls_certResolver }}"  # noqa var-naming
+
+# Controls whether labels will be added to expose the compatibility layer on the internal Traefik entrypoint.
+# This is similar to `matrix_authentication_service_container_labels_public_compatibility_layer_enabled`, but the entrypoint and intent is different.
+# Regardless of whether this is enabled, it may or may not take effect due to the value of other variables.
+# See `matrix_authentication_service_container_labels_traefik_enabled`
+matrix_authentication_service_container_labels_internal_compatibility_layer_enabled: false
+matrix_authentication_service_container_labels_internal_compatibility_layer_path_regexp: "{{ matrix_authentication_service_container_labels_public_compatibility_layer_path_regexp }}"
+matrix_authentication_service_container_labels_internal_compatibility_layer_rule: "PathRegexp(`{{ matrix_authentication_service_container_labels_internal_compatibility_layer_path_regexp }}`)"
+matrix_authentication_service_container_labels_internal_compatibility_layer_priority: 0
+matrix_authentication_service_container_labels_internal_compatibility_layer_entrypoints: ""
+
+# Controls which additional headers to attach to all HTTP responses.
+# To add your own headers, use `matrix_authentication_service_container_labels_traefik_additional_response_headers_custom`
+matrix_authentication_service_container_labels_traefik_additional_response_headers: "{{ matrix_authentication_service_container_labels_traefik_additional_response_headers_auto | combine(matrix_authentication_service_container_labels_traefik_additional_response_headers_custom) }}"
+matrix_authentication_service_container_labels_traefik_additional_response_headers_auto: {}
+matrix_authentication_service_container_labels_traefik_additional_response_headers_custom: {}
+
+# matrix_authentication_service_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file.
+# See `../templates/labels.j2` for details.
+#
+# Example:
+# matrix_authentication_service_container_labels_additional_labels: |
+#   my.label=1
+#   another.label="here"
+matrix_authentication_service_container_labels_additional_labels: ''
+
+########################################################################################
+#                                                                                      #
+# /Labels                                                                              #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# syn2mas configuration                                                                #
+#                                                                                      #
+########################################################################################
+
+matrix_authentication_service_syn2mas_start_wait_time_seconds: 5
+
+matrix_authentication_service_syn2mas_dry_run: false
+
+# renovate: datasource=docker depName=ghcr.io/element-hq/matrix-authentication-service/syn2mas
+matrix_authentication_service_syn2mas_version: 0.12.0
+matrix_authentication_service_syn2mas_container_image: "{{ matrix_authentication_service_container_image_name_prefix }}element-hq/matrix-authentication-service/syn2mas:{{ matrix_authentication_service_syn2mas_version }}"
+matrix_authentication_service_syn2mas_container_image_name_prefix: "{{ 'localhost/' if matrix_authentication_service_container_image_self_build else 'ghcr.io/' }}"
+matrix_authentication_service_syn2mas_container_image_force_pull: "{{ matrix_authentication_service_syn2mas_container_image.endswith(':latest') }}"
+
+matrix_authentication_service_syn2mas_container_image_self_build: "{{ matrix_authentication_service_container_image_self_build }}"
+
+matrix_authentication_service_syn2mas_container_network: "{{ matrix_authentication_service_container_network }}"
+
+# Path to Synapse's homeserver.yaml configuration file.
+matrix_authentication_service_syn2mas_synapse_homeserver_config_path: ""
+
+# Additional arguments passed to the syn2mas process.
+#
+# Example:
+# matrix_authentication_service_syn2mas_process_extra_arguments:
+#   - "--upstreamProviderMapping oidc-keycloak:01H8PKNWKKRPCBW4YGH1RWV279"
+matrix_authentication_service_syn2mas_process_extra_arguments: []
+
+########################################################################################
+#                                                                                      #
+# /syn2mas configuration                                                               #
+#                                                                                      #
+########################################################################################
+
+
+########################################################################################
+#                                                                                      #
+# Misc                                                                                 #
+#                                                                                      #
+########################################################################################
+
+# Controls whether a migration from a homeserver user database to Matrix Authentication Service is in progress.
+#
+# When this is set to `true`, the playbook will:
+#
+# - disable the integration between the homeserver and Matrix Authentication Service
+# - avoid setting up the "compatibility layer" (that is, avoid installing container labels that capture login endpoints like `/_matrix/client/*/login`, etc.)
+matrix_authentication_service_migration_in_progress: false
+
+########################################################################################
+#                                                                                      #
+# /Misc                                                                                #
+#                                                                                      #
+########################################################################################

roles/custom/matrix-authentication-service/tasks/install.yml

@@ -0,0 +1,103 @@
+---
+
+- name: Ensure Matrix Authentication Service paths exist
+  ansible.builtin.file:
+    path: "{{ item.path }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - {path: "{{ matrix_authentication_service_base_path }}", when: true}
+    - {path: "{{ matrix_authentication_service_bin_path }}", when: true}
+    - {path: "{{ matrix_authentication_service_config_path }}", when: true}
+    - {path: "{{ matrix_authentication_service_data_path }}", when: true}
+    - {path: "{{ matrix_authentication_service_data_keys_path }}", when: true}
+    - {path: "{{ matrix_authentication_service_container_src_files_path }}", when: "{{ matrix_authentication_service_container_image_self_build }}"}
+  when: "item.when | bool"
+
+- when: matrix_authentication_service_key_management_enabled | bool
+  block:
+    - name: Ensure openssl installed
+      ansible.builtin.package:
+        name: openssl
+        state: present
+
+    - name: Prepare private key
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/util/prepare_key.yml"
+      with_items: "{{ matrix_authentication_service_key_management_list }}"
+      loop_control:
+        loop_var: private_key_definition
+
+- name: Ensure Matrix Authentication Service configuration installed
+  ansible.builtin.copy:
+    content: "{{ matrix_authentication_service_configuration | to_nice_yaml(indent=2, width=999999) }}"
+    dest: "{{ matrix_authentication_service_config_path }}/config.yaml"
+    mode: 0644
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+
+- name: Ensure Matrix Authentication Service support files created
+  ansible.builtin.template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - src: "{{ role_path }}/templates/env.j2"
+      dest: "{{ matrix_authentication_service_config_path }}/env"
+      mode: '0644'
+    - src: "{{ role_path }}/templates/labels.j2"
+      dest: "{{ matrix_authentication_service_config_path }}/labels"
+      mode: '0644'
+    - src: "{{ role_path }}/templates/bin/register-user.j2"
+      dest: "{{ matrix_authentication_service_bin_path }}/register-user"
+      mode: '0755'
+    - src: "{{ role_path }}/templates/bin/mas-cli.j2"
+      dest: "{{ matrix_authentication_service_bin_path }}/mas-cli"
+      mode: '0755'
+
+- name: Ensure Matrix Authentication Service container image is pulled
+  community.docker.docker_image:
+    name: "{{ matrix_authentication_service_container_image }}"
+    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
+    force_source: "{{ matrix_authentication_service_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
+    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_authentication_service_container_image_force_pull }}"
+  when: "not matrix_authentication_service_container_image_self_build | bool"
+  register: result
+  retries: "{{ devture_playbook_help_container_retries_count }}"
+  delay: "{{ devture_playbook_help_container_retries_delay }}"
+  until: result is not failed
+
+- when: "matrix_authentication_service_container_image_self_build | bool"
+  block:
+    - name: Ensure Matrix Authentication Service repository is present on self-build
+      ansible.builtin.git:
+        repo: "{{ matrix_authentication_service_container_repo }}"
+        version: "{{ matrix_authentication_service_container_repo_version }}"
+        dest: "{{ matrix_authentication_service_container_src_files_path }}"
+        force: "yes"
+      become: true
+      become_user: "{{ matrix_user_username }}"
+
+    - name: Ensure Matrix Authentication Service container image is built
+      ansible.builtin.command:
+        cmd: |-
+          {{ devture_systemd_docker_base_host_command_docker }} buildx build
+          --tag={{ matrix_authentication_service_container_image }}
+          --file={{ matrix_authentication_service_container_src_files_path }}/Dockerfile
+          {{ matrix_authentication_service_container_src_files_path }}
+      changed_when: true
+
+- name: Ensure Matrix Authentication Service container network is created
+  community.general.docker_network:
+    enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
+    name: "{{ matrix_authentication_service_container_network }}"
+    driver: bridge
+
+- name: Ensure matrix-authentication-service.service installed
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/systemd/matrix-authentication-service.service.j2"
+    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-authentication-service.service"
+    mode: 0644

roles/custom/matrix-authentication-service/tasks/main.yml

@@ -0,0 +1,38 @@
+---
+
+- tags:
+    - setup-all
+    - setup-matrix-authentication-service
+    - install-all
+    - install-matrix-authentication-service
+  block:
+    - when: matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
+
+    - when: matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/install.yml"
+
+- tags:
+    - matrix-authentication-service-syn2mas
+  block:
+    - when: matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/syn2mas.yml"
+
+- tags:
+    - matrix-authentication-service-mas-cli-doctor
+  block:
+    - when: matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/mas_cli_doctor.yml"
+
+- tags:
+    - register-user
+  block:
+    - when: matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/register_user.yml"
+
+- tags:
+    - setup-all
+    - setup-matrix-authentication-service
+  block:
+    - when: not matrix_authentication_service_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml"

roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml

@@ -0,0 +1,32 @@
+---
+
+- name: Ensure Matrix Authentication Service is started
+  ansible.builtin.service:
+    name: matrix-authentication-service
+    state: started
+    daemon_reload: true
+  register: matrix_authentication_service_mas_ensure_started_result
+
+- name: Wait a bit, so that Matrix Authentication Service can start
+  when: matrix_authentication_service_mas_ensure_started_result.changed | bool
+  ansible.builtin.wait_for:
+    timeout: "{{ matrix_authentication_service_syn2mas_start_wait_time_seconds }}"
+  delegate_to: 127.0.0.1
+  become: false
+
+- name: Generate mas-cli doctor command
+  ansible.builtin.set_fact:
+    matrix_authentication_service_mas_cli_doctor_command: >-
+      {{ matrix_authentication_service_bin_path }}/mas-cli doctor
+  tags:
+    - skip_ansible_lint
+
+- name: Run mas-cli doctor
+  ansible.builtin.command:
+    cmd: "{{ matrix_authentication_service_mas_cli_doctor_command }}"
+  register: matrix_authentication_service_mas_cli_doctor_command_result
+  changed_when: matrix_authentication_service_mas_cli_doctor_command_result.rc == 0
+
+- name: Print mas-cli doctor command result
+  ansible.builtin.debug:
+    var: matrix_authentication_service_mas_cli_doctor_command_result

roles/custom/matrix-authentication-service/tasks/register_user.yml

@@ -0,0 +1,34 @@
+---
+
+- name: Fail if playbook called incorrectly
+  ansible.builtin.fail:
+    msg: "The `username` variable needs to be provided to this playbook, via --extra-vars"
+  when: "username is not defined or username == '<your-username>'"
+
+- name: Fail if playbook called incorrectly
+  ansible.builtin.fail:
+    msg: "The `password` variable needs to be provided to this playbook, via --extra-vars"
+  when: "password is not defined or password == '<your-password>'"
+
+- name: Fail if playbook called incorrectly
+  ansible.builtin.fail:
+    msg: "The `admin` variable needs to be provided to this playbook, via --extra-vars"
+  when: "admin is not defined or admin not in ['yes', 'no']"
+
+- name: Ensure Matrix Authentication Service is started
+  ansible.builtin.service:
+    name: matrix-authentication-service
+    state: started
+    daemon_reload: true
+  register: matrix_authentication_service_start_result
+
+- name: Wait a while, so that Matrix Authentication Service can start
+  ansible.builtin.pause:
+    seconds: 7
+  when: matrix_authentication_service_start_result.changed | bool
+
+- name: Register user
+  ansible.builtin.command:
+    cmd: "{{ matrix_authentication_service_bin_path }}/register-user {{ username | quote }} {{ password | quote }} {{ '1' if admin == 'yes' else '0' }}"
+  register: matrix_authentication_service_register_user_result
+  changed_when: matrix_authentication_service_register_user_result.rc == 0

roles/custom/matrix-authentication-service/tasks/syn2mas.yml

@@ -0,0 +1,138 @@
+---
+
+- ansible.builtin.set_fact:
+    matrix_authentication_service_syn2mas_dry_run: "{{ matrix_authentication_service_syn2mas_dry_run | bool }}"
+
+- name: Abort, if not using Synapse
+  when: not matrix_synapse_enabled | bool
+  ansible.builtin.fail:
+    msg: |-
+      You can only use syn2mas to migrate from Synapse to Matrix Authentication Service.
+      Other homeserver implementations are not supported.
+
+- name: Fail if required matrix-authentication-service syn2mas settings not defined
+  ansible.builtin.fail:
+    msg: >-
+      You need to define a required configuration setting (`{{ item.name }}`).
+  when: "item.when | bool and vars[item.name] | length == 0"
+  with_items:
+    - {'name': 'matrix_authentication_service_syn2mas_synapse_homeserver_config_path', when: true}
+
+- name: Check if Synapse homeserver config file exists
+  ansible.builtin.stat:
+    path: "{{ matrix_authentication_service_syn2mas_synapse_homeserver_config_path }}"
+  register: matrix_authentication_service_syn2mas_synapse_config_stat
+
+- name: Fail if Synapse homeserver config file does not exist
+  ansible.builtin.fail:
+    msg: "The Synapse homeserver config file does not exist at the specified path: {{ matrix_authentication_service_syn2mas_synapse_homeserver_config_path }}"
+  when: not matrix_authentication_service_syn2mas_synapse_config_stat.stat.exists
+
+- name: Ensure Matrix Authentication Service syn2mas container image is pulled
+  community.docker.docker_image:
+    name: "{{ matrix_authentication_service_syn2mas_container_image }}"
+    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
+    force_source: "{{ matrix_authentication_service_syn2mas_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
+    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_authentication_service_syn2mas_container_image_force_pull }}"
+  when: "not matrix_authentication_service_syn2mas_container_image_self_build | bool"
+  register: result
+  retries: "{{ devture_playbook_help_container_retries_count }}"
+  delay: "{{ devture_playbook_help_container_retries_delay }}"
+  until: result is not failed
+
+- when: "matrix_authentication_service_syn2mas_container_image_self_build | bool"
+  block:
+    - name: Ensure Matrix Authentication Service repository is present on self-build
+      ansible.builtin.git:
+        repo: "{{ matrix_authentication_service_container_repo }}"
+        version: "{{ matrix_authentication_service_container_repo_version }}"
+        dest: "{{ matrix_authentication_service_container_src_files_path }}"
+        force: "yes"
+      become: true
+      become_user: "{{ matrix_user_username }}"
+      register: matrix_authentication_service_git_pull_results
+
+    - name: Ensure Matrix Authentication Service syn2mas container image is built
+      ansible.builtin.command:
+        cmd: |-
+          {{ devture_systemd_docker_base_host_command_docker }} buildx build
+          --tag={{ matrix_authentication_service_syn2mas_container_image }}
+          --file={{ matrix_authentication_service_container_src_files_path }}/tools/syn2mas/Dockerfile
+          {{ matrix_authentication_service_container_src_files_path }}/tools/syn2mas
+      changed_when: true
+
+- name: Ensure Synapse is stopped
+  when: not matrix_authentication_service_syn2mas_dry_run | bool
+  ansible.builtin.service:
+    name: matrix-synapse
+    state: stopped
+    daemon_reload: true
+  register: matrix_authentication_service_synapse_ensure_stopped_result
+
+# We probably don't necessarily need to stop this, because:
+# - the upstream docs don't say we should.
+# - while a migration is in progress (see `matrix_authentication_service_migration_in_progress`),
+#   we don't even add compatibility layer labels, so MAS would not be used anyway.
+#
+# Still, it's probably safer to stop it anyway.
+- name: Ensure Matrix Authentication Service is stopped
+  ansible.builtin.service:
+    name: matrix-authentication-service
+    state: stopped
+  register: matrix_authentication_service_mas_ensure_stopped_result
+
+- name: Generate syn2mas migration command
+  ansible.builtin.set_fact:
+    matrix_authentication_service_syn2mas_migration_command: >-
+      {{ devture_systemd_docker_base_host_command_docker }} run
+      --rm
+      --name=matrix-authentication-service-syn2mas
+      --log-driver=none
+      --user={{ matrix_authentication_service_uid }}:{{ matrix_authentication_service_gid }}
+      --cap-drop=ALL
+      --network={{ matrix_authentication_service_syn2mas_container_network }}
+      --mount type=bind,src={{ matrix_authentication_service_syn2mas_synapse_homeserver_config_path }},dst=/homeserver.yaml,ro
+      --mount type=bind,src={{ matrix_authentication_service_config_path }}/config.yaml,dst=/mas-config.yaml,ro
+      {{ matrix_authentication_service_syn2mas_container_image }}
+      --command=migrate
+      --synapseConfigFile=/homeserver.yaml
+      --masConfigFile=/mas-config.yaml
+      {{ matrix_authentication_service_syn2mas_process_extra_arguments | join(' ') }}
+      {% if matrix_authentication_service_syn2mas_dry_run | bool %}--dryRun{% endif %}
+  tags:
+    - skip_ansible_lint
+
+# This is a hack.
+# See: https://ansibledaily.com/print-to-standard-output-without-escaping/
+#
+# We want to run `debug: msg=".."`, but that dumps it as JSON and escapes double quotes within it,
+# which ruins the command (`matrix_authentication_service_syn2mas_migration_command`)
+- name: Note about syn2mas migration
+  ansible.builtin.set_fact:
+    dummy: true
+  with_items:
+    - >-
+        Running syn2mas migration using the following command: `{{ matrix_authentication_service_syn2mas_migration_command }}`.
+        If this crashes, you can stop Synapse (`systemctl stop matrix-synapse`) and run the command manually.
+
+- name: Perform syn2mas migration
+  ansible.builtin.command:
+    cmd: "{{ matrix_authentication_service_syn2mas_migration_command }}"
+  register: matrix_authentication_service_syn2mas_migration_command_result
+  changed_when: matrix_authentication_service_syn2mas_migration_command_result.rc == 0
+
+- name: Print syn2mas migration command result
+  ansible.builtin.debug:
+    var: matrix_authentication_service_syn2mas_migration_command_result
+
+- name: Ensure Synapse is started (if it previously was)
+  when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_synapse_ensure_stopped_result.changed"
+  ansible.builtin.service:
+    name: matrix-synapse
+    state: started
+
+- name: Ensure Matrix Authentication Service is started (if it previously was)
+  when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"
+  ansible.builtin.service:
+    name: matrix-authentication-service
+    state: started

roles/custom/matrix-authentication-service/tasks/uninstall.yml

@@ -0,0 +1,25 @@
+---
+
+- name: Check existence of matrix-authentication-service service
+  ansible.builtin.stat:
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-authentication-service.service"
+  register: matrix_authentication_service_service_stat
+
+- when: matrix_authentication_service_service_stat.stat.exists | bool
+  block:
+    - name: Ensure matrix-authentication-service is stopped
+      ansible.builtin.service:
+        name: matrix-authentication-service
+        state: stopped
+        enabled: false
+        daemon_reload: true
+
+    - name: Ensure matrix-authentication-service.service doesn't exist
+      ansible.builtin.file:
+        path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-authentication-service.service"
+        state: absent
+
+    - name: Ensure Matrix Authentication Service paths don't exist
+      ansible.builtin.file:
+        path: "{{ matrix_authentication_service_base_path }}"
+        state: absent

roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml

@@ -0,0 +1,12 @@
+---
+
+- name: Prepare Matrix Authentication Service private key file path ({{ private_key_definition.key_file }})
+  ansible.builtin.set_fact:
+    matrix_authentication_service_private_key_file_path: "{{ matrix_authentication_service_data_keys_path }}/{{ private_key_definition.key_file }}"
+
+- name: Prepare Matrix Authentication Service private key file ({{ private_key_definition.key_file }})
+  ansible.builtin.command:
+    cmd: "{{ private_key_definition.generation_command | replace('__KEY_FILE_PATH__', matrix_authentication_service_private_key_file_path) }}"
+    creates: "{{ matrix_authentication_service_private_key_file_path }}"
+  become: true
+  become_user: "{{ matrix_user_username }}"

roles/custom/matrix-authentication-service/tasks/validate_config.yml

@@ -0,0 +1,31 @@
+---
+
+- name: Fail if required matrix-authentication-service settings not defined
+  ansible.builtin.fail:
+    msg: >-
+      You need to define a required configuration setting (`{{ item.name }}`).
+  when: "item.when | bool and vars[item.name] | length == 0"
+  with_items:
+    - {'name': 'matrix_authentication_service_hostname', when: true}
+    - {'name': 'matrix_authentication_service_config_database_username', when: true}
+    - {'name': 'matrix_authentication_service_config_database_password', when: true}
+    - {'name': 'matrix_authentication_service_config_database_host', when: true}
+    - {'name': 'matrix_authentication_service_config_database_database', when: true}
+    - {'name': 'matrix_authentication_service_config_secrets_encryption', when: true}
+    - {'name': 'matrix_authentication_service_config_matrix_homeserver', when: true}
+    - {'name': 'matrix_authentication_service_config_matrix_secret', when: true}
+    - {'name': 'matrix_authentication_service_config_matrix_endpoint', when: true}
+    - {'name': 'matrix_authentication_service_container_labels_public_main_hostname', when: "{{ matrix_authentication_service_container_labels_traefik_enabled }}"}
+    - {'name': 'matrix_authentication_service_container_labels_public_compatibility_layer_hostname', when: "{{ matrix_authentication_service_container_labels_public_compatibility_layer_enabled }}"}
+    - {'name': 'matrix_authentication_service_container_labels_internal_compatibility_layer_entrypoints', when: "{{ matrix_authentication_service_container_labels_internal_compatibility_layer_enabled }}"}
+    - {'name': 'matrix_authentication_service_config_email_hostname', when: "{{ matrix_authentication_service_config_email_transport == 'smtp' }}"}
+
+- name: Fail if matrix_authentication_service_config_secrets_encryption is not 64 characters long
+  ansible.builtin.fail:
+    msg: "matrix_authentication_service_config_secrets_encryption must be exactly 64 characters long (preferably generated via `openssl rand -hex 32`)"
+  when: "matrix_authentication_service_config_secrets_encryption | length != 64"
+
+- name: Fail if matrix_authentication_service_config_email_transport is invalid
+  ansible.builtin.fail:
+    msg: "matrix_authentication_service_config_email_transport must be one of: blackhole, smtp, or aws_ses"
+  when: "matrix_authentication_service_config_email_transport not in ['blackhole', 'smtp', 'aws_ses']"

roles/custom/matrix-authentication-service/templates/bin/mas-cli.j2

@@ -0,0 +1,16 @@
+#jinja2: lstrip_blocks: "True"
+#!/bin/bash
+
+args=$@
+
+if [ $# -eq 0 ]; then
+    args="help"
+fi
+
+if [ -t 0 ]; then
+    tty_option="-it"
+else
+    tty_option=""
+fi
+
+{{ devture_systemd_docker_base_host_command_docker }} exec $tty_option matrix-authentication-service mas-cli $args

roles/custom/matrix-authentication-service/templates/bin/register-user.j2

@@ -0,0 +1,17 @@
+#jinja2: lstrip_blocks: "True"
+#!/bin/bash
+
+if [ $# -ne 3 ]; then
+	echo "Usage: "$0" <username> <password> <admin access: 0 or 1>"
+	exit 1
+fi
+
+user=$1
+password=$2
+admin=$3
+
+if [ "$admin" -eq "1" ]; then
+	{{ devture_systemd_docker_base_host_command_docker }} exec matrix-authentication-service mas-cli manage register-user --yes -p "$password" --admin "$user"
+else
+	{{ devture_systemd_docker_base_host_command_docker }} exec matrix-authentication-service mas-cli manage register-user --yes -p "$password" --no-admin "$user"
+fi

roles/custom/matrix-authentication-service/templates/config.yaml.j2

@@ -0,0 +1,82 @@
+#jinja2: lstrip_blocks: "True"
+http:
+  listeners:
+  - name: web
+    resources:
+    - name: discovery
+    - name: human
+    - name: oauth
+    - name: compat
+    - name: graphql
+    - name: assets
+    binds:
+    - address: '[::]:8080'
+    proxy_protocol: false
+    prefix: {{ matrix_authentication_service_path_prefix }}
+  - name: internal
+    resources:
+    - name: health
+    binds:
+    - host: localhost
+      port: 8081
+    proxy_protocol: false
+    prefix: {{ matrix_authentication_service_path_prefix }}
+  trusted_proxies: {{ matrix_authentication_service_config_http_trusted_proxies | to_json }}
+  public_base: {{ matrix_authentication_service_config_http_public_base | to_json }}
+  issuer: {{ matrix_authentication_service_config_http_issuer | to_json }}
+
+database:
+  host: {{ matrix_authentication_service_config_database_host | to_json }}
+  port: {{ matrix_authentication_service_config_database_port | to_json }}
+  username: {{ matrix_authentication_service_config_database_username | to_json }}
+  password: {{ matrix_authentication_service_config_database_password | to_json }}
+  database: {{ matrix_authentication_service_config_database_database | to_json }}
+  ssl_mode: {{ matrix_authentication_service_config_database_ssl_mode | to_json }}
+  max_connections: {{ matrix_authentication_service_config_database_max_connections | to_json }}
+  min_connections: {{ matrix_authentication_service_config_database_min_connections | to_json }}
+  connect_timeout: {{ matrix_authentication_service_config_database_connect_timeout | to_json }}
+  idle_timeout: {{ matrix_authentication_service_config_database_idle_timeout | to_json }}
+  max_lifetime: {{ matrix_authentication_service_config_database_max_lifetime | to_json }}
+
+email:
+  from: {{ matrix_authentication_service_config_email_from | to_json }}
+  reply_to: {{ matrix_authentication_service_config_email_reply_to | to_json }}
+  transport: {{ matrix_authentication_service_config_email_transport | to_json }}
+  {% if matrix_authentication_service_config_email_transport == 'smtp' %}
+  mode: {{ matrix_authentication_service_config_email_mode | to_json }}
+  hostname: {{ matrix_authentication_service_config_email_hostname | to_json }}
+  port: {{ matrix_authentication_service_config_email_port | int | to_json }}
+  {% if matrix_authentication_service_config_email_username %}
+  username: {{ matrix_authentication_service_config_email_username | to_json }}
+  {% endif %}
+  {% if matrix_authentication_service_config_email_password %}
+  password: {{ matrix_authentication_service_config_email_password | to_json }}
+  {% endif %}
+  {% endif %}
+secrets:
+  encryption: {{ matrix_authentication_service_config_secrets_encryption | to_json }}
+  keys: {{ matrix_authentication_service_config_secrets_keys | to_json }}
+
+passwords:
+  enabled: {{ matrix_authentication_service_config_passwords_enabled | to_json }}
+  schemes: {{ matrix_authentication_service_config_passwords_schemes | to_json }}
+  minimum_complexity: {{ matrix_authentication_service_config_passwords_minimum_complexity | to_json }}
+
+matrix:
+  homeserver: {{ matrix_authentication_service_config_matrix_homeserver | to_json }}
+  secret: {{ matrix_authentication_service_config_matrix_secret | to_json }}
+  endpoint: {{ matrix_authentication_service_config_matrix_endpoint | to_json }}
+
+account:
+  email_change_allowed: {{ matrix_authentication_service_config_account_email_change_allowed | to_json }}
+  displayname_change_allowed: {{ matrix_authentication_service_config_account_displayname_change_allowed | to_json }}
+  password_registration_enabled: {{ matrix_authentication_service_config_account_password_registration_enabled | to_json }}
+  password_change_allowed: {{ matrix_authentication_service_config_account_password_change_allowed | to_json }}
+  password_recovery_enabled: {{ matrix_authentication_service_config_account_password_recovery_enabled | to_json }}
+
+clients: {{ matrix_authentication_service_config_clients | to_json }}
+
+{% if matrix_authentication_service_config_upstream_oauth2_providers | length > 0 %}
+upstream_oauth2:
+  providers: {{ matrix_authentication_service_config_upstream_oauth2_providers | to_json }}
+{% endif %}

roles/custom/matrix-authentication-service/templates/env.j2

@@ -0,0 +1 @@
+{{ matrix_authentication_service_environment_variables_extension }}

roles/custom/matrix-authentication-service/templates/labels.j2

@@ -0,0 +1,134 @@
+{% if matrix_authentication_service_container_labels_traefik_enabled %}
+traefik.enable=true
+
+{% if matrix_authentication_service_container_labels_traefik_docker_network %}
+traefik.docker.network={{ matrix_authentication_service_container_labels_traefik_docker_network }}
+{% endif %}
+
+traefik.http.services.matrix-authentication-service.loadbalancer.server.port=8080
+
+########################################################################################
+#                                                                                      #
+# Public Main                                                                          #
+#                                                                                      #
+########################################################################################
+
+{% set main_middlewares = [] %}
+
+{% if matrix_authentication_service_container_labels_public_main_path_prefix != '/' %}
+traefik.http.middlewares.matrix-authentication-service-slashless-redirect.redirectregex.regex=({{ matrix_authentication_service_container_labels_public_main_path_prefix | quote }})$
+traefik.http.middlewares.matrix-authentication-service-slashless-redirect.redirectregex.replacement=${1}/
+{% set main_middlewares = main_middlewares + ['matrix-authentication-service-slashless-redirect'] %}
+{% endif %}
+
+{% if matrix_authentication_service_container_labels_traefik_additional_response_headers.keys() | length > 0 %}
+{% for name, value in matrix_authentication_service_container_labels_traefik_additional_response_headers.items() %}
+traefik.http.middlewares.matrix-authentication-service-add-headers.headers.customresponseheaders.{{ name }}={{ value }}
+{% endfor %}
+{% set main_middlewares = main_middlewares + ['matrix-authentication-service-add-headers'] %}
+{% endif %}
+
+traefik.http.routers.matrix-authentication-service.rule={{ matrix_authentication_service_container_labels_public_main_rule }}
+
+{% if matrix_authentication_service_container_labels_public_main_priority | int > 0 %}
+traefik.http.routers.matrix-authentication-service.priority={{ matrix_authentication_service_container_labels_public_main_priority }}
+{% endif %}
+
+traefik.http.routers.matrix-authentication-service.service=matrix-authentication-service
+
+{% if main_middlewares | length > 0 %}
+traefik.http.routers.matrix-authentication-service.middlewares={{ main_middlewares | join(',') }}
+{% endif %}
+
+traefik.http.routers.matrix-authentication-service.entrypoints={{ matrix_authentication_service_container_labels_public_main_entrypoints }}
+traefik.http.routers.matrix-authentication-service.tls={{ matrix_authentication_service_container_labels_public_main_tls | to_json }}
+{% if matrix_authentication_service_container_labels_public_main_tls %}
+traefik.http.routers.matrix-authentication-service.tls.certResolver={{ matrix_authentication_service_container_labels_public_main_tls_certResolver }}
+{% endif %}
+
+########################################################################################
+#                                                                                      #
+# /Public Main                                                                         #
+#                                                                                      #
+########################################################################################
+
+{% if matrix_authentication_service_container_labels_public_compatibility_layer_enabled %}
+########################################################################################
+#                                                                                      #
+# Public Compatibility Layer                                                           #
+#                                                                                      #
+########################################################################################
+
+{% set compatibility_layer_middlewares = [] %}
+
+{% if matrix_authentication_service_container_labels_public_main_path_prefix != '/' %}
+traefik.http.middlewares.matrix-authentication-service-add-prefix.addprefix.prefix={{ matrix_authentication_service_container_labels_public_main_path_prefix }}
+{% set compatibility_layer_middlewares = compatibility_layer_middlewares + ['matrix-authentication-service-add-prefix'] %}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.rule={{ matrix_authentication_service_container_labels_public_compatibility_layer_rule }}
+
+{% if matrix_authentication_service_container_labels_public_compatibility_layer_priority | int > 0 %}
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.priority={{ matrix_authentication_service_container_labels_public_compatibility_layer_priority }}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.service=matrix-authentication-service
+
+{% if compatibility_layer_middlewares | length > 0 %}
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.middlewares={{ compatibility_layer_middlewares | join(',') }}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.entrypoints={{ matrix_authentication_service_container_labels_public_compatibility_layer_entrypoints }}
+
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.tls={{ matrix_authentication_service_container_labels_public_compatibility_layer_tls | to_json }}
+{% if matrix_authentication_service_container_labels_public_compatibility_layer_tls %}
+traefik.http.routers._internalmatrix-authentication-service-public-compatibility-layer.tls.certResolver={{ matrix_authentication_service_container_labels_public_compatibility_layer_tls_certResolver }}
+{% endif %}
+
+########################################################################################
+#                                                                                      #
+# /Public Compatibility Layer                                                          #
+#                                                                                      #
+########################################################################################
+{% endif %}
+
+
+{% if matrix_authentication_service_container_labels_internal_compatibility_layer_enabled %}
+########################################################################################
+#                                                                                      #
+# Internal Compatibility Layer                                                         #
+#                                                                                      #
+########################################################################################
+
+{% set compatibility_layer_middlewares = [] %}
+
+{% if matrix_authentication_service_container_labels_public_main_path_prefix != '/' %}
+traefik.http.middlewares.matrix-authentication-service-add-prefix.addprefix.prefix={{ matrix_authentication_service_container_labels_public_main_path_prefix }}
+{% set compatibility_layer_middlewares = compatibility_layer_middlewares + ['matrix-authentication-service-add-prefix'] %}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-internal-compatibility-layer.rule={{ matrix_authentication_service_container_labels_internal_compatibility_layer_rule }}
+
+{% if matrix_authentication_service_container_labels_internal_compatibility_layer_priority | int > 0 %}
+traefik.http.routers._internalmatrix-authentication-service-internal-compatibility-layer.priority={{ matrix_authentication_service_container_labels_internal_compatibility_layer_priority }}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-internal-compatibility-layer.service=matrix-authentication-service
+
+{% if compatibility_layer_middlewares | length > 0 %}
+traefik.http.routers._internalmatrix-authentication-service-internal-compatibility-layer.middlewares={{ compatibility_layer_middlewares | join(',') }}
+{% endif %}
+
+traefik.http.routers._internalmatrix-authentication-service-internal-compatibility-layer.entrypoints={{ matrix_authentication_service_container_labels_internal_compatibility_layer_entrypoints }}
+
+########################################################################################
+#                                                                                      #
+# /Internal Compatibility Layer                                                        #
+#                                                                                      #
+########################################################################################
+{% endif %}
+
+
+{% endif %}
+
+{{ matrix_authentication_service_container_labels_additional_labels }}

roles/custom/matrix-authentication-service/templates/provider/anthropic-config.yml.j2

@@ -0,0 +1,13 @@
+#jinja2: lstrip_blocks: "True"
+base_url: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_base_url | to_json }}
+
+api_key: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_api_key | to_json }}
+
+{% if matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_enabled %}
+text_generation:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_model_id | to_json }}
+  prompt: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_prompt | to_json }}
+  temperature: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_temperature | to_json }}
+  max_response_tokens: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_max_response_tokens | int | to_json }}
+  max_context_tokens: {{ matrix_authentication_service_config_agents_static_definitions_anthropic_config_text_generation_max_context_tokens | int | to_json }}
+{% endif %}

roles/custom/matrix-authentication-service/templates/provider/groq-config.yml.j2

@@ -0,0 +1,18 @@
+#jinja2: lstrip_blocks: "True"
+base_url: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_base_url | to_json }}
+
+api_key: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_api_key | to_json }}
+
+{% if matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_enabled %}
+text_generation:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_model_id | to_json }}
+  prompt: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_prompt | to_json }}
+  temperature: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_temperature | to_json }}
+  max_response_tokens: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_max_response_tokens | int | to_json }}
+  max_context_tokens: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_text_generation_max_context_tokens | int | to_json }}
+{% endif %}
+
+{% if matrix_authentication_service_config_agents_static_definitions_groq_config_speech_to_text_enabled %}
+speech_to_text:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_groq_config_speech_to_text_model_id | to_json }}
+{% endif %}

roles/custom/matrix-authentication-service/templates/provider/mistral-config.yml.j2

@@ -0,0 +1,13 @@
+#jinja2: lstrip_blocks: "True"
+base_url: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_base_url | to_json }}
+
+api_key: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_api_key | to_json }}
+
+{% if matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_enabled %}
+text_generation:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_model_id | to_json }}
+  prompt: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_prompt | to_json }}
+  temperature: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_temperature | to_json }}
+  max_response_tokens: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_max_response_tokens | int | to_json }}
+  max_context_tokens: {{ matrix_authentication_service_config_agents_static_definitions_mistral_config_text_generation_max_context_tokens | int | to_json }}
+{% endif %}

roles/custom/matrix-authentication-service/templates/provider/openai-config.yml.j2

@@ -0,0 +1,33 @@
+#jinja2: lstrip_blocks: "True"
+base_url: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_base_url | to_json }}
+
+api_key: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_api_key | to_json }}
+
+{% if matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_enabled %}
+text_generation:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_model_id | to_json }}
+  prompt: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_prompt | to_json }}
+  temperature: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_temperature | to_json }}
+  max_response_tokens: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_max_response_tokens | int | to_json }}
+  max_context_tokens: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_generation_max_context_tokens | int | to_json }}
+{% endif %}
+
+{% if matrix_authentication_service_config_agents_static_definitions_openai_config_speech_to_text_enabled %}
+speech_to_text:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_speech_to_text_model_id | to_json }}
+{% endif %}
+
+{% if matrix_authentication_service_config_agents_static_definitions_openai_config_text_to_speech_enabled %}
+text_to_speech:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_to_speech_model_id | to_json }}
+  voice: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_to_speech_voice | to_json }}
+  speed: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_to_speech_speed | float }}
+  response_format: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_text_to_speech_response_format | to_json }}
+{% endif %}
+
+{% if matrix_authentication_service_config_agents_static_definitions_openai_config_image_generation_enabled %}
+image_generation:
+  model_id: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_image_generation_model_id | to_json }}
+  style: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_image_generation_style | to_json }}
+  size: {{ matrix_authentication_service_config_agents_static_definitions_openai_config_image_generation_size | to_json }}
+{% endif %}

roles/custom/matrix-authentication-service/templates/systemd/matrix-authentication-service.service.j2

@@ -0,0 +1,49 @@
+#jinja2: lstrip_blocks: "True"
+[Unit]
+Description=Matrix Authentication Service
+{% for service in matrix_authentication_service_systemd_required_services_list %}
+Requires={{ service }}
+After={{ service }}
+{% endfor %}
+{% for service in matrix_authentication_service_systemd_wanted_services_list %}
+Wants={{ service }}
+{% endfor %}
+DefaultDependencies=no
+
+[Service]
+Type=simple
+Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
+ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-authentication-service 2>/dev/null || true'
+ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-authentication-service 2>/dev/null || true'
+
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-authentication-service \
+			--log-driver=none \
+			--user={{ matrix_authentication_service_uid }}:{{ matrix_authentication_service_gid }} \
+			--cap-drop=ALL \
+			--read-only \
+			--network={{ matrix_authentication_service_container_network }} \
+			--env-file={{ matrix_authentication_service_config_path }}/env \
+			--label-file={{ matrix_authentication_service_config_path }}/labels \
+			--mount type=bind,src={{ matrix_authentication_service_config_path }}/config.yaml,dst=/config.yaml,ro \
+			--mount type=bind,src={{ matrix_authentication_service_data_keys_path }},dst=/keys,ro \
+			{% for arg in matrix_authentication_service_container_extra_arguments %}
+			{{ arg }} \
+			{% endfor %}
+			{{ matrix_authentication_service_container_image }}
+
+{% for network in matrix_authentication_service_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-authentication-service
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-authentication-service
+
+ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-authentication-service 2>/dev/null || true'
+ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-authentication-service 2>/dev/null || true'
+Restart=always
+RestartSec=30
+SyslogIdentifier=matrix-authentication-service
+
+[Install]
+WantedBy=multi-user.target

roles/custom/matrix-authentication-service/vars/main.yml

@@ -0,0 +1,6 @@
+---
+
+# Like `matrix_authentication_service_config_http_public_base` but a private base URL only accessible from within the container network.
+matrix_authentication_service_http_base_container_url: "http://matrix-authentication-service:8080{{ '/' if matrix_authentication_service_path_prefix == '/' else (matrix_authentication_service_path_prefix + '/') }}"
+
+matrix_authentication_service_account_management_url: "{{ matrix_authentication_service_config_http_public_base }}account"

roles/custom/matrix-base/defaults/main.yml

@@ -1,15 +1,15 @@
 ---
 
 # The bare domain name which represents your Matrix identity.
-# Matrix user ids for your server will be of the form (`@user:<matrix-domain>`).
+# Matrix user IDs for your server will be of the form (`@user:example.com`).
 #
 # Note: this playbook does not touch the server referenced here.
-# Installation happens on another server ("matrix.<matrix-domain>", see `matrix_server_fqn_matrix`).
+# Installation happens on another server ("matrix.example.com", see `matrix_server_fqn_matrix`).
 #
 # Example value: example.com
 matrix_domain: ~
 
-# The optional matrix admin MXID, used in bridges' configs to set bridge admin user
+# The optional Matrix admin MXID, used in bridges' configs to set bridge admin user
 # Example value: "@someone:{{ matrix_domain }}"
 matrix_admin: ''
 
@@ -54,7 +54,7 @@ matrix_homeserver_enabled: true
 # By default, we use Synapse, because it's the only full-featured Matrix server at the moment.
 #
 # This value automatically influences other variables (`matrix_synapse_enabled`, `matrix_dendrite_enabled`, etc.).
-# The homeserver implementation of an existing server cannot be changed without data loss.
+# Note that the homeserver implementation of a server will not be able to be changed without data loss.
 matrix_homeserver_implementation: synapse
 
 # This contains a secret, which is used for generating various other secrets later on.
@@ -67,7 +67,7 @@ matrix_server_fqn_matrix: "matrix.{{ matrix_domain }}"
 # This is where you access federation API.
 matrix_server_fqn_matrix_federation: '{{ matrix_server_fqn_matrix }}'
 
-# This is where you access the Element web UI from (if enabled via matrix_client_element_enabled; enabled by default).
+# This is where you access the Element Web from (if enabled via matrix_client_element_enabled; enabled by default).
 # This and the Matrix FQN (see above) are expected to be on the same server.
 matrix_server_fqn_element: "element.{{ matrix_domain }}"
 
@@ -77,16 +77,16 @@ matrix_server_fqn_hydrogen: "hydrogen.{{ matrix_domain }}"
 # This is where you access the Cinny web client from (if enabled via matrix_client_cinny_enabled; disabled by default).
 matrix_server_fqn_cinny: "cinny.{{ matrix_domain }}"
 
-# This is where you access the schildichat web client from (if enabled via matrix_client_schildichat_enabled; disabled by default).
+# This is where you access the SchildiChat Web from (if enabled via matrix_client_schildichat_enabled; disabled by default).
 matrix_server_fqn_schildichat: "schildichat.{{ matrix_domain }}"
 
-# This is where you access the buscarron bot from (if enabled via matrix_bot_buscarron_enabled; disabled by default).
+# This is where you access the Buscarron bot from (if enabled via matrix_bot_buscarron_enabled; disabled by default).
 matrix_server_fqn_buscarron: "buscarron.{{ matrix_domain }}"
 
 # This is where you access the Dimension.
 matrix_server_fqn_dimension: "dimension.{{ matrix_domain }}"
 
-# This is where you access the etherpad (if enabled via etherpad_enabled; disabled by default).
+# This is where you access the Etherpad (if enabled via etherpad_enabled; disabled by default).
 matrix_server_fqn_etherpad: "etherpad.{{ matrix_domain }}"
 
 # For use with Go-NEB! (github callback url for example)
@@ -139,8 +139,8 @@ matrix_user_username: "matrix"
 matrix_user_groupname: "matrix"
 
 # By default, the playbook creates the user (`matrix_user_username`)
-# and group (`matrix_user_groupname`) with a random id.
-# To use a specific user/group id, override these variables.
+# and group (`matrix_user_groupname`) with a random ID.
+# To use a specific user/group ID, override these variables.
 matrix_user_uid: ~
 matrix_user_gid: ~
 
@@ -239,6 +239,13 @@ matrix_playbook_reverse_proxy_container_network: 'traefik'
 # Specifies the hostname that the reverse-proxy is available at
 matrix_playbook_reverse_proxy_hostname: 'matrix-traefik'
 
+# Specifies whether the Traefik reverse-proxy (if `matrix_playbook_reverse_proxy_type` indicates that Traefik is being used) defines a compression middleware.
+matrix_playbook_reverse_proxy_traefik_middleware_compression_enabled: false
+
+# Specifies the name of the compression middleware defined for the Traefik reverse-proxy (if `matrix_playbook_reverse_proxy_type` indicates that Traefik is being used).
+# It's better to use a fully-qualified middleware name (e.g. `compression@docker` or `compression@file`) here to prevent ambiguity.
+matrix_playbook_reverse_proxy_traefik_middleware_compression_name: ''
+
 # Controls the additional network that reverse-proxyable services will be connected to.
 matrix_playbook_reverse_proxyable_services_additional_network: "{{ matrix_playbook_reverse_proxy_container_network }}"
 
@@ -267,11 +274,38 @@ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_host_bind_port_u
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config: "{{ (matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_default | combine (matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_auto)) | combine(matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_custom, recursive=True) }}"
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_enabled: true
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_advertisedPort: "{{ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_port }}"  # noqa var-naming
+matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_readTimeout: "{{ traefik_config_entrypoint_web_secure_transport_respondingTimeouts_readTimeout }}"  # noqa var-naming
+matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_writeTimeout: "{{ traefik_config_entrypoint_web_secure_transport_respondingTimeouts_writeTimeout }}"  # noqa var-naming
+matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_idleTimeout: "{{ traefik_config_entrypoint_web_secure_transport_respondingTimeouts_idleTimeout }}"  # noqa var-naming
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_default: |
   {{
-    ({'http3': {'advertisedPort': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_advertisedPort | int}})
-    if matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_enabled
-    else {}
+    {}
+
+    | combine(
+      (
+        (
+          {
+            'http3': {
+              'advertisedPort': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_advertisedPort | int
+            }
+          }
+        )
+        if matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_enabled
+        else {}
+      )
+    )
+
+    | combine(
+      {
+        'transport': {
+          'respondingTimeouts': {
+            'readTimeout': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_readTimeout,
+            'writeTimeout': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_writeTimeout,
+            'idleTimeout': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_idleTimeout,
+          }
+        }
+      }
+    )
   }}
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_auto: {}
 matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_custom: {}
@@ -289,7 +323,7 @@ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_definition:
 # may wish to register their routes with this additional entrypoint and provide their services on it for internal (no-public-network and non-TLS) use.
 #
 # This entrypoint provides local addons (e.g. bridges, bots, etc.) with the ability to easily & quickly communicate with the homeserver and/or related software.
-# Such services can reach the homeserver over the public internet (e.g. https://matrix.DOMAIN), but this is slow due to networking and SSL-termination.
+# Such services can reach the homeserver over the public internet (e.g. https://matrix.example.com), but this is slow due to networking and SSL-termination.
 # Talking directly to the homeserver (e.g. `http://matrix-synapse:8008`) is another option, but does not allow other homeserver-related software
 # (e.g. identity servers like ma1sd, media repository servers like matrix-media-repo, firewalls like matrix-corporal)
 # to register itself for certain homeserver routes.

roles/custom/matrix-base/tasks/validate_config.yml

@@ -30,7 +30,7 @@
 
       If you're observing this error on a new installation, you should ensure that the `matrix_homeserver_generic_secret_key` is defined.
       If you think you've defined it, but are still getting this error, then it's likely that you have a typo
-      in your domain name in `inventory/hosts` or in one of the directories leading up to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file.
+      in your domain name in `inventory/hosts` or in one of the directories leading up to your `inventory/host_vars/matrix.example.com/vars.yml` file.
 
       If you're observing this error on an existing homeserver installation, you can fix it easily and in a backward-compatible way by adding
       `{% raw %}matrix_homeserver_generic_secret_key: "{{ matrix_synapse_macaroon_secret_key }}"{% endraw %}`

roles/custom/matrix-base/templates/bin/remove-all.j2

@@ -14,7 +14,7 @@ if [ "$sure" != "Yes, I really want to remove everything!" ]; then
 	echo "Good thing I asked, exiting"
 	exit 0
 else
-	echo "Stop and remove matrix services"
+	echo "Stop and remove Matrix services"
 
 	for s in $(find {{ devture_systemd_docker_base_systemd_path }}/ -type f -name "matrix-*" -printf "%f\n"); do
 		systemctl disable --now $s
@@ -32,4 +32,3 @@ else
 	rm -fr "{{ matrix_base_data_path }}"
 	exit 0
 fi
-

roles/custom/matrix-bot-baibot/defaults/main.yml

@@ -11,7 +11,7 @@ matrix_bot_baibot_container_repo_version: "{{ 'main' if matrix_bot_baibot_versio
 matrix_bot_baibot_container_src_files_path: "{{ matrix_base_data_path }}/baibot/container-src"
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/baibot
-matrix_bot_baibot_version: v1.2.0
+matrix_bot_baibot_version: v1.4.0
 matrix_bot_baibot_container_image: "{{ matrix_bot_baibot_container_image_name_prefix }}etkecc/baibot:{{ matrix_bot_baibot_version }}"
 matrix_bot_baibot_container_image_name_prefix: "{{ 'localhost/' if matrix_bot_baibot_container_image_self_build else 'ghcr.io/' }}"
 matrix_bot_baibot_container_image_force_pull: "{{ matrix_bot_baibot_container_image.endswith(':latest') }}"
@@ -93,7 +93,7 @@ matrix_bot_baibot_config_command_prefix: "!bai"
 # Example:
 # matrix_bot_baibot_config_access_admin_patterns:
 #   - "@*:example.com"
-#   - "@admin:another.com"
+#   - "@admin:example.net"
 matrix_bot_baibot_config_access_admin_patterns: "{{ [matrix_admin] if matrix_admin else [] }}"
 
 # Controls the `persistence.data_dir_path` configuration setting.
@@ -155,7 +155,7 @@ matrix_bot_baibot_config_agents_static_definitions_auto: |-
   }}
 matrix_bot_baibot_config_agents_static_definitions_custom: []
 
-matrix_bot_baibot_config_agents_static_definitions_prompt: "{% raw %}You are a brief, but helpful bot called {{ baibot_name }} powered by the {{ baibot_model_id }} model. The date/time now is: {{ baibot_now_utc }}.{% endraw %}"
+matrix_bot_baibot_config_agents_static_definitions_prompt: "{% raw %}You are a brief, but helpful bot called {{ baibot_name }} powered by the {{ baibot_model_id }} model. The date/time of this conversation's start is: {{ baibot_conversation_start_time_utc }}.{% endraw %}"
 
 ########################################################################################
 #                                                                                      #
@@ -356,7 +356,7 @@ matrix_bot_baibot_config_agents_static_definitions_openai_config_api_key: ""
 
 matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_enabled: true
 # For valid model choices, see: https://platform.openai.com/docs/models
-matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_model_id: gpt-4o-2024-08-06
+matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_model_id: gpt-4o
 # The prompt text to use (can be null or empty to not use a prompt).
 # See: https://huggingface.co/docs/transformers/en/tasks/prompting
 matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_prompt: "{{ matrix_bot_baibot_config_agents_static_definitions_prompt }}"

roles/custom/matrix-bot-baibot/tasks/install.yml

@@ -8,9 +8,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
+    - {path: "{{ matrix_bot_baibot_base_path }}", when: true}
     - {path: "{{ matrix_bot_baibot_config_path }}", when: true}
     - {path: "{{ matrix_bot_baibot_data_path }}", when: true}
-    - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: matrix_bot_baibot_container_image_self_build}
+    - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: "{{ matrix_bot_baibot_container_image_self_build }}"}
   when: "item.when | bool"
 
 - name: Ensure baibot configuration installed
@@ -29,7 +30,7 @@
     group: "{{ matrix_user_groupname }}"
     mode: 0640
 
-- name: Ensure baibot image is pulled
+- name: Ensure baibot container image is pulled
   community.docker.docker_image:
     name: "{{ matrix_bot_baibot_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -41,28 +42,28 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure baibot repository is present on self-build
-  ansible.builtin.git:
-    repo: "{{ matrix_bot_baibot_container_repo }}"
-    version: "{{ matrix_bot_baibot_container_repo_version }}"
-    dest: "{{ matrix_bot_baibot_container_src_files_path }}"
-    force: "yes"
-  become: true
-  become_user: "{{ matrix_user_username }}"
-  register: matrix_bot_baibot_git_pull_results
-  when: "matrix_bot_baibot_container_image_self_build | bool"
+- when: "matrix_bot_baibot_container_image_self_build | bool"
+  block:
+    - name: Ensure baibot repository is present on self-build
+      ansible.builtin.git:
+        repo: "{{ matrix_bot_baibot_container_repo }}"
+        version: "{{ matrix_bot_baibot_container_repo_version }}"
+        dest: "{{ matrix_bot_baibot_container_src_files_path }}"
+        force: "yes"
+      become: true
+      become_user: "{{ matrix_user_username }}"
+      register: matrix_bot_baibot_git_pull_results
 
-- name: Ensure baibot image is built
-  community.docker.docker_image:
-    name: "{{ matrix_bot_baibot_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_baibot_container_src_files_path }}"
-      pull: true
-  when: "matrix_bot_baibot_container_image_self_build | bool"
+    - name: Ensure baibot container image is built
+      community.docker.docker_image:
+        name: "{{ matrix_bot_baibot_container_image }}"
+        source: build
+        force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
+        force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}"
+        build:
+          dockerfile: Dockerfile
+          path: "{{ matrix_bot_baibot_container_src_files_path }}"
+          pull: true
 
 - name: Ensure baibot container network is created
   community.general.docker_network:

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

@@ -1,6 +1,6 @@
 ---
 
-# buscarron is a Web forms (HTTP POST) to Matrix service.
+# Buscarron is a Web forms (HTTP POST) to Matrix service.
 # Project source code URL: https://github.com/etkecc/buscarron
 
 matrix_bot_buscarron_enabled: true
@@ -186,7 +186,7 @@ matrix_bot_buscarron_smtp_from: ''
 # enforce SMTP validation
 matrix_bot_buscarron_smtp_validation: false
 
-# Additional environment variables to pass to the buscarron container
+# Additional environment variables to pass to the Buscarron container
 #
 # Example:
 # matrix_bot_buscarron_environment_variables_extension: |

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

@@ -12,7 +12,7 @@
     - when: "matrix_bot_buscarron_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -26,7 +26,7 @@
         - ansible.builtin.set_fact:
             matrix_bot_buscarron_requires_restart: true
 
-- name: Ensure buscarron paths exist
+- name: Ensure Buscarron paths exist
   ansible.builtin.file:
     path: "{{ item.path }}"
     state: directory
@@ -40,7 +40,7 @@
     - {path: "{{ matrix_bot_buscarron_docker_src_files_path }}", when: true}
   when: "item.when | bool"
 
-- name: Ensure buscarron support files installed
+- name: Ensure Buscarron support files installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/{{ item }}.j2"
     dest: "{{ matrix_bot_buscarron_config_path }}/{{ item }}"
@@ -51,7 +51,7 @@
     - env
     - labels
 
-- name: Ensure buscarron image is pulled
+- name: Ensure Buscarron image is pulled
   community.docker.docker_image:
     name: "{{ matrix_bot_buscarron_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -63,7 +63,7 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure buscarron repository is present on self-build
+- name: Ensure Buscarron repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_bot_buscarron_docker_repo }}"
     version: "{{ matrix_bot_buscarron_docker_repo_version }}"
@@ -74,7 +74,7 @@
   register: matrix_bot_buscarron_git_pull_results
   when: "matrix_bot_buscarron_container_image_self_build | bool"
 
-- name: Ensure buscarron image is built
+- name: Ensure Buscarron image is built
   community.docker.docker_image:
     name: "{{ matrix_bot_buscarron_docker_image }}"
     source: build
@@ -92,7 +92,7 @@
     dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-buscarron.service"
     mode: 0644
 
-- name: Ensure buscarron container network is created
+- name: Ensure Buscarron container network is created
   community.general.docker_network:
     enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
     name: "{{ matrix_bot_buscarron_container_network }}"

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

@@ -19,7 +19,7 @@
         path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-buscarron.service"
         state: absent
 
-    - name: Ensure Matrix buscarron paths don't exist
+    - name: Ensure Matrix Buscarron paths don't exist
       ansible.builtin.file:
         path: "{{ matrix_bot_buscarron_base_path }}"
         state: absent

roles/custom/matrix-bot-chatgpt/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# chatgpt is a bot for chatting to openAI chatgpt matrix bot
+# chatgpt is a bot for chatting to openAI chatgpt Matrix bot
 # Project source code URL: https://github.com/matrixgpt/matrix-chatgpt-bot
 
 matrix_bot_chatgpt_enabled: true
@@ -57,7 +57,7 @@ matrix_bot_chatgpt_keyv_bot_storage: true
 # Matrix Static Settings (required, see notes)
 # Defaults to "https://matrix.org"
 matrix_bot_chatgpt_matrix_homeserver_url: ""  # MATRIX_HOMESERVER_URL=
-# With the @ and :DOMAIN, ie @SOMETHING:DOMAIN, needs to be set, created manually beforehand.
+# With the @ and :example.com, ie @SOMETHING:example.com, needs to be set, created manually beforehand.
 matrix_bot_chatgpt_matrix_bot_username_localpart: 'bot.chatgpt'
 matrix_bot_chatgpt_matrix_bot_username: "@{{ matrix_bot_chatgpt_matrix_bot_username_localpart }}:{{ matrix_domain }}"  # MATRIX_BOT_USERNAME=
 # Set `MATRIX_BOT_PASSWORD` the bot will print an `MATRIX_ACCESS_TOKEN` to the terminal
@@ -73,7 +73,7 @@ matrix_bot_chatgpt_matrix_default_prefix_reply: false  # MATRIX_DEFAULT_PREFIX_R
 # Matrix Access Control (optional)
 #
 # Lists of space-separated entries. Example:
-# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :second-domain.com :third-domain.com"
+# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :example.net :example.org"
 matrix_bot_chatgpt_matrix_blacklist: ''
 matrix_bot_chatgpt_matrix_whitelist: ':{{ matrix_domain }}'
 
@@ -90,7 +90,7 @@ matrix_bot_chatgpt_matrix_rich_text: true  # MATRIX_RICH_TEXT=true
 # - @someone:example.com
 # - @another:example.com
 # - @bot.*:example.com
-# - @*:another.com
+# - @*:example.net
 # matrix_bot_chatgpt_admins: "{{ [matrix_admin] if matrix_admin else [] }}"
 
 # Additional environment variables to pass to the chatgpt container

roles/custom/matrix-bot-chatgpt/templates/env.j2

@@ -10,7 +10,7 @@ KEYV_URL={{ matrix_bot_chatgpt_keyv_url }}
 KEYV_BOT_ENCRYPTION={{ matrix_bot_chatgpt_keyv_bot_encryption|lower }}
 KEYV_BOT_STORAGE={{ matrix_bot_chatgpt_keyv_bot_storage|lower }}
 
-# With the @ and :DOMAIN, ie @SOMETHING:DOMAIN
+# With the @ and :example.com, ie @SOMETHING:example.com
 MATRIX_BOT_USERNAME={{ matrix_bot_chatgpt_matrix_bot_username }}
 MATRIX_BOT_PASSWORD={{ matrix_bot_chatgpt_matrix_bot_password }}
 

roles/custom/matrix-bot-draupnir/defaults/main.yml

@@ -66,7 +66,7 @@ matrix_bot_draupnir_pantalaimon_password: ""
 # Note: Draupnir is fairly verbose - expect a lot of messages from it.
 matrix_bot_draupnir_management_room: ""
 
-# Endpoint URL that Draupnir uses to interact with the matrix homeserver (client-server API).
+# Endpoint URL that Draupnir uses to interact with the Matrix homeserver (client-server API).
 # Set this to the pantalaimon URL if you're using that.
 matrix_bot_draupnir_homeserver_url: ""
 
@@ -106,7 +106,7 @@ matrix_bot_draupnir_configuration_extension: "{{ matrix_bot_draupnir_configurati
 # You most likely don't need to touch this variable. Instead, see `matrix_bot_draupnir_configuration_yaml`.
 matrix_bot_draupnir_configuration: "{{ matrix_bot_draupnir_configuration_yaml | from_yaml | combine(matrix_bot_draupnir_configuration_extension, recursive=True) }}"
 
-# Controls whether labels will be added that redirect the /_matrix/client/../rooms/../report paths to draupnir
+# Controls whether labels will be added that redirect the /_matrix/client/../rooms/../report paths to Draupnir
 # Following these recommendations (https://github.com/element-hq/synapse/blob/master/docs/reverse_proxy.md), by default, we don't.
 # Regardless of whether this is enabled, it may or may not take effect due to the value of other variables.
 # See `matrix_synapse_container_labels_traefik_enabled` or `matrix_synapse_container_labels_matrix_related_labels_enabled`

roles/custom/matrix-bot-draupnir/tasks/setup_install.yml

@@ -28,7 +28,7 @@
     - src: "{{ role_path }}/templates/labels.j2"
       dest: "{{ matrix_bot_draupnir_base_path }}/labels"
 
-- name: Ensure draupnir Docker image is pulled
+- name: Ensure Draupnir Docker image is pulled
   community.docker.docker_image:
     name: "{{ matrix_bot_draupnir_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -40,7 +40,7 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure draupnir repository is present on self-build
+- name: Ensure Draupnir repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_bot_draupnir_container_image_self_build_repo }}"
     dest: "{{ matrix_bot_draupnir_docker_src_files_path }}"
@@ -51,7 +51,7 @@
   register: matrix_bot_draupnir_git_pull_results
   when: "matrix_bot_draupnir_container_image_self_build | bool"
 
-- name: Ensure draupnir Docker image is built
+- name: Ensure Draupnir Docker image is built
   community.docker.docker_image:
     name: "{{ matrix_bot_draupnir_docker_image }}"
     source: build

roles/custom/matrix-bot-draupnir/templates/production.yaml.j2

@@ -1,4 +1,4 @@
-# Endpoint URL that Draupnir uses to interact with the matrix homeserver (client-server API),
+# Endpoint URL that Draupnir uses to interact with the Matrix homeserver (client-server API),
 # set this to the pantalaimon URL if you're using that.
 homeserverUrl: {{ matrix_bot_draupnir_homeserver_url | to_json }}
 
@@ -12,7 +12,7 @@ accessToken: {{ matrix_bot_draupnir_access_token | to_json }}
 {% if matrix_bot_draupnir_pantalaimon_use %}
 # Options related to Pantalaimon (https://github.com/matrix-org/pantalaimon)
 pantalaimon:
-  # Whether or not Draupnir will use pantalaimon to access the matrix homeserver,
+  # Whether or not Draupnir will use pantalaimon to access the Matrix homeserver,
   # set to `true` if you're using pantalaimon.
   #
   # Be sure to point homeserverUrl to the pantalaimon instance.
@@ -38,7 +38,7 @@ autojoinOnlyIfManager: true
 
 # If `autojoinOnlyIfManager` is false, only the members in this space can invite
 # the bot to new rooms.
-#acceptInvitesFromSpace: "!example:example.org"
+#acceptInvitesFromSpace: "!qporfwt:example.com"
 
 # Whether Draupnir should report ignored invites to the management room (if autojoinOnlyIfManager is true).
 recordIgnoredInvites: false
@@ -56,7 +56,7 @@ managementRoom: {{ matrix_bot_draupnir_management_room | to_json }}
 # Deprecated and will be removed in a future version.
 # Running with verboseLogging is unsupported.
 # Whether Draupnir should log a lot more messages in the room,
-# mainly involves "all-OK" messages, and debugging messages for when draupnir checks bans in a room.
+# mainly involves "all-OK" messages, and debugging messages for when Draupnir checks bans in a room.
 #verboseLogging: false
 
 # The log level of terminal (or container) output,
@@ -109,7 +109,7 @@ automaticallyRedactForReasons:
 #
 # Note: These must be matrix.to URLs
 #protectedRooms:
-#  - "https://matrix.to/#/#yourroom:example.org"
+#  - "https://matrix.to/#/#matrix:example.org"
 
 # Whether or not to add all joined rooms to the "protected rooms" list
 # (excluding the management room and watched policy list rooms, see below).

roles/custom/matrix-bot-go-neb/defaults/main.yml

@@ -163,7 +163,7 @@ matrix_bot_go_neb_storage_database: "{{
 # The access tokens that the bot uses to authenticate.
 # Generate one as described in
 # https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-playbook-dimension.md#access-token
-# via curl. With the element method, you might run into decryption problems (see https://github.com/matrix-org/go-neb#quick-start)
+# via curl. With the Element method, you might run into decryption problems (see https://github.com/matrix-org/go-neb#quick-start)
 matrix_bot_go_neb_clients: []
 #  - UserID: "@goneb:{{ matrix_domain }}"
 #    AccessToken: "MDASDASJDIASDJASDAFGFRGER"
@@ -262,7 +262,7 @@ matrix_bot_go_neb_services: []
 #    Config:
 #      feeds:
 #        "http://lorem-rss.herokuapp.com/feed?unit=second&interval=60":
-#          rooms: ["!qmElAGdFYCHoCJuaNt:localhost"]
+#          rooms: ["!qporfwt:localhost"]
 #          must_include:
 #            author:
 #              - author1
@@ -288,13 +288,13 @@ matrix_bot_go_neb_services: []
 #      RealmID: "github_realm"
 #      ClientUserID: "@YOUR_USER_ID:{{ matrix_domain }}" # needs to be an authenticated user so Go-NEB can create webhooks. Check the UserID field in the github_realm in matrix_bot_go_neb_sessions.
 #      Rooms:
-#        "!someroom:id":
+#        "!qporfwt:example.com":
 #          Repos:
 #            "element-hq/synapse":
 #              Events: ["push", "issues"]
 #            "matrix-org/dendron":
 #              Events: ["pull_request"]
-#        "!anotherroom:id":
+#        "!aaabaa:example.com":
 #          Repos:
 #            "element-hq/synapse":
 #              Events: ["push", "issues"]
@@ -307,7 +307,7 @@ matrix_bot_go_neb_services: []
 #    Config:
 #      Hooks:
 #        "hook1":
-#          RoomID: "!someroom:id"
+#          RoomID: "!qporfwt:example.com"
 #          MessageType: "m.text" # default is m.text
 #
 #  - ID: "alertmanager_service"
@@ -321,7 +321,7 @@ matrix_bot_go_neb_services: []
 #      webhook_url: "http://localhost/services/hooks/YWxlcnRtYW5hZ2VyX3NlcnZpY2U"
 #      # Each room will get the notification with the alert rendered with the given template
 #      rooms:
-#        "!someroomid:domain.tld":
+#        "!qporfwt:example.com":
 #          text_template: "{% raw %}{{range .Alerts -}} [{{ .Status }}] {{index .Labels \"alertname\"}}: {{index .Annotations \"description\"}} {{ end -}}{% endraw %}"
 #          html_template: "{% raw %}{{range .Alerts -}}  {{ $severity := index .Labels \"severity\"}}    {{ if eq .Status \"firing\"}}      {{ if eq $severity \"critical\"}}        <font color='red'><b>[FIRING - CRITICAL]</b></font>      {{ else if eq $severity \"warning\"}}        <font color='orange'><b>[FIRING - WARNING]</b></font>      {{ else }}        <b>[FIRING - {{ $severity }}]</b>      {{ end }}    {{ else }}      <font color='green'><b>[RESOLVED]</b></font>    {{ end }}  {{ index .Labels \"alertname\"}} : {{ index .Annotations \"description\"}}   <a href=\"{{ .GeneratorURL }}\">source</a><br/>{{end -}}{% endraw %}"
 #          msg_type: "m.text"  # Must be either `m.text` or `m.notice`

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

@@ -1,17 +1,17 @@
 ---
-# honoroit is a helpdesk bot
+# Honoroit is a helpdesk bot
 # Project source code URL: https://github.com/etkecc/honoroit
 
 matrix_bot_honoroit_enabled: true
 
-# The hostname at which honoroit is served.
+# The hostname at which Honoroit is served.
 matrix_bot_honoroit_hostname: ''
 
-# The path at which honoroit is exposed.
+# The path at which Honoroit is exposed.
 # This value must either be `/` or not end with a slash (e.g. `/honoroit`).
 matrix_bot_honoroit_path_prefix: /
 
-# The path at which honoroit will expose metrics
+# The path at which Honoroit will expose metrics
 # This value must either be `/` or not end with a slash (e.g. `/metrics`).
 matrix_bot_honoroit_metrics_path: /metrics
 
@@ -156,19 +156,19 @@ matrix_bot_honoroit_healthchecks_duration: 60  # in seconds
 matrix_bot_honoroit_redmine_host: ''  # e.g. https://redmine.example.com
 matrix_bot_honoroit_redmine_apikey: ''
 matrix_bot_honoroit_redmine_project: ''  # project identifier (e.g. 'myproject')
-matrix_bot_honoroit_redmine_tracker_id: ''  # tracker id (e.g. 1)
-matrix_bot_honoroit_redmine_new_status_id: ''  # new status id (e.g. 1)
-matrix_bot_honoroit_redmine_in_progress_status_id: ''  # in progress status id (e.g. 2)
-matrix_bot_honoroit_redmine_done_status_id: ''  # done status id (e.g. 3)
+matrix_bot_honoroit_redmine_tracker_id: ''  # tracker ID (e.g. 1)
+matrix_bot_honoroit_redmine_new_status_id: ''  # new status ID (e.g. 1)
+matrix_bot_honoroit_redmine_in_progress_status_id: ''  # in progress status ID (e.g. 2)
+matrix_bot_honoroit_redmine_done_status_id: ''  # done status ID (e.g. 3)
 
-# A list of whitelisted users allowed to use/invite honoroit
+# A list of whitelisted users allowed to use/invite a Honoroit bot
 # If not defined, everyone is allowed.
 # Example set of rules:
 # matrix_bot_honoroit_allowedusers:
 # - @someone:example.com
 # - @another:example.com
 # - @bot.*:example.com
-# - @*:another.com
+# - @*:example.net
 matrix_bot_honoroit_allowedusers:
   - "@*:*"
 

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

@@ -12,7 +12,7 @@
     - when: "matrix_bot_honoroit_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -26,7 +26,7 @@
         - ansible.builtin.set_fact:
             matrix_bot_honoroit_requires_restart: true
 
-- name: Ensure honoroit paths exist
+- name: Ensure Honoroit paths exist
   ansible.builtin.file:
     path: "{{ item.path }}"
     state: directory
@@ -40,7 +40,7 @@
     - {path: "{{ matrix_bot_honoroit_docker_src_files_path }}", when: true}
   when: "item.when | bool"
 
-- name: Ensure honoroit support files installed
+- name: Ensure Honoroit support files installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/{{ item }}.j2"
     dest: "{{ matrix_bot_honoroit_config_path }}/{{ item }}"
@@ -51,7 +51,7 @@
     - env
     - labels
 
-- name: Ensure honoroit image is pulled
+- name: Ensure Honoroit image is pulled
   community.docker.docker_image:
     name: "{{ matrix_bot_honoroit_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -63,7 +63,7 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure honoroit repository is present on self-build
+- name: Ensure Honoroit repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_bot_honoroit_docker_repo }}"
     version: "{{ matrix_bot_honoroit_docker_repo_version }}"
@@ -74,7 +74,7 @@
   register: matrix_bot_honoroit_git_pull_results
   when: "matrix_bot_honoroit_container_image_self_build | bool"
 
-- name: Ensure honoroit image is built
+- name: Ensure Honoroit image is built
   community.docker.docker_image:
     name: "{{ matrix_bot_honoroit_docker_image }}"
     source: build
@@ -86,7 +86,7 @@
       pull: true
   when: "matrix_bot_honoroit_container_image_self_build | bool"
 
-- name: Ensure honoroit container network is created
+- name: Ensure Honoroit container network is created
   community.general.docker_network:
     enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
     name: "{{ matrix_bot_honoroit_container_network }}"

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

@@ -19,7 +19,7 @@
         path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-honoroit.service"
         state: absent
 
-    - name: Ensure Matrix honoroit paths don't exist
+    - name: Ensure Matrix Honoroit paths don't exist
       ansible.builtin.file:
         path: "{{ matrix_bot_honoroit_base_path }}"
         state: absent

roles/custom/matrix-bot-honoroit/tasks/validate_config.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Fail if required honoroit settings not defined
+- name: Fail if required Honoroit settings not defined
   ansible.builtin.fail:
     msg: >-
       You need to define a required configuration setting (`{{ item.name }}`).

roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# matrix-registration-bot creates and manages registration tokens for a matrix server
+# matrix-registration-bot creates and manages registration tokens for a Matrix server
 # Project source code URL: https://github.com/moan0s/matrix-registration-bot
 
 matrix_bot_matrix_registration_bot_enabled: true
@@ -23,7 +23,7 @@ matrix_bot_matrix_registration_bot_bot_server: "{{ matrix_homeserver_url }}"
 matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_homeserver_url }}"
 
 
-# The bot's password (can also be used to login via a client like element)
+# The bot's password (can also be used to login via a client like Element Web)
 matrix_bot_matrix_registration_bot_bot_password: ''
 
 # Optional variable that only needs to be set if the bot account is not admin

roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml

@@ -6,7 +6,7 @@ matrix_bot_matrix_reminder_bot_enabled: true
 
 matrix_bot_matrix_reminder_bot_container_image_self_build: false
 matrix_bot_matrix_reminder_bot_docker_repo: "https://github.com/anoadragon453/matrix-reminder-bot.git"
-matrix_bot_matrix_reminder_bot_docker_repo_version: "{{ matrix_bot_matrix_reminder_bot_version }}"
+matrix_bot_matrix_reminder_bot_docker_repo_version: "{{ 'master' if matrix_bot_matrix_reminder_bot_version == 'latest' else matrix_bot_matrix_reminder_bot_version }}"
 matrix_bot_matrix_reminder_bot_docker_src_files_path: "{{ matrix_base_data_path }}/matrix-reminder-bot/docker-src"
 
 # renovate: datasource=docker depName=ghcr.io/anoadragon453/matrix-reminder-bot

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

@@ -13,7 +13,7 @@
     - when: "matrix_bot_matrix_reminder_bot_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2

@@ -39,9 +39,9 @@ allowlist:
   enabled: {{ matrix_bot_matrix_reminder_bot_allowlist_enabled | to_json }}
   # A list of MXID regexes to be allowed
   # To allow a certain homeserver:
-  #     regexes: ["@[a-z0-9-_.]+:myhomeserver.tld"]
+  #     regexes: ["@[a-z0-9-_.]+:example.com"]
   # To allow a set of users:
-  #     regexes: ["@alice:someserver.tld", "@bob:anotherserver.tld"]
+  #     regexes: ["@alice:example.net", "@bob:example.org"]
   # To allow nobody (same as blocking every MXID):
   #     regexes: []
   regexes: {{ matrix_bot_matrix_reminder_bot_allowlist_regexes | to_json }}
@@ -53,9 +53,9 @@ blocklist:
   enabled: {{ matrix_bot_matrix_reminder_bot_blocklist_enabled | to_json }}
   # A list of MXID regexes to be blocked
   # To block a certain homeserver:
-  #     regexes: [".*:myhomeserver.tld"]
+  #     regexes: [".*:example.com"]
   # To block a set of users:
-  #     regexes: ["@alice:someserver.tld", "@bob:anotherserver.tld"]
+  #     regexes: ["@alice:example.net", "@bob:example.org"]
   # To block absolutely everyone (same as allowing nobody):
   #     regexes: [".*"]
   regexes: {{ matrix_bot_matrix_reminder_bot_blocklist_regexes | to_json }}

roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2

@@ -16,6 +16,10 @@ Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-maubot 2>/dev/null || true'
 ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-maubot 2>/dev/null || true'
 
+{#
+	We mount a tmpfs at /tmp, because some maubot plugins may wish to write to it.
+	It makes sense to provide at least some sort of temporary storage.
+#}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			--rm \
 			--name=matrix-bot-maubot \
@@ -25,6 +29,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			--cap-drop=ALL \
 			--mount type=bind,src={{ matrix_bot_maubot_config_path }},dst=/config,ro \
 			--mount type=bind,src={{ matrix_bot_maubot_data_path }},dst=/data \
+			--tmpfs=/tmp:rw,noexec,nosuid,size=1024m \
 			--label-file={{ matrix_bot_maubot_base_path }}/labels \
 			{% for arg in matrix_bot_maubot_container_extra_arguments %}
 			{{ arg }} \

roles/custom/matrix-bot-mjolnir/defaults/main.yml

@@ -5,7 +5,7 @@
 matrix_bot_mjolnir_enabled: true
 
 # renovate: datasource=docker depName=matrixdotorg/mjolnir
-matrix_bot_mjolnir_version: "v1.8.1"
+matrix_bot_mjolnir_version: "v1.8.3"
 
 matrix_bot_mjolnir_container_image_self_build: false
 matrix_bot_mjolnir_container_image_self_build_repo: "https://github.com/matrix-org/mjolnir.git"
@@ -57,7 +57,7 @@ matrix_bot_mjolnir_pantalaimon_password: ""
 # Note: Mjolnir is fairly verbose - expect a lot of messages from it.
 matrix_bot_mjolnir_management_room: ""
 
-# Endpoint URL that Mjolnir uses to interact with the matrix homeserver (client-server API).
+# Endpoint URL that Mjolnir uses to interact with the Matrix homeserver (client-server API).
 # Set this to the pantalaimon URL if you're using that.
 matrix_bot_mjolnir_homeserver_url: ""
 

roles/custom/matrix-bot-mjolnir/templates/production.yaml.j2

@@ -1,4 +1,4 @@
-# Endpoint URL that Mjolnir uses to interact with the matrix homeserver (client-server API),
+# Endpoint URL that Mjolnir uses to interact with the Matrix homeserver (client-server API),
 # set this to the pantalaimon URL if you're using that.
 homeserverUrl: {{ matrix_bot_mjolnir_homeserver_url | to_json }}
 
@@ -12,7 +12,7 @@ accessToken: {{ matrix_bot_mjolnir_access_token | to_json }}
 {% if matrix_bot_mjolnir_pantalaimon_use %}
 # Options related to Pantalaimon (https://github.com/matrix-org/pantalaimon)
 pantalaimon:
-  # Whether or not Mjolnir will use pantalaimon to access the matrix homeserver,
+  # Whether or not Mjolnir will use pantalaimon to access the Matrix homeserver,
   # set to `true` if you're using pantalaimon.
   #
   # Be sure to point homeserverUrl to the pantalaimon instance.
@@ -38,7 +38,7 @@ autojoinOnlyIfManager: true
 
 # If `autojoinOnlyIfManager` is false, only the members in this space can invite
 # the bot to new rooms.
-#acceptInvitesFromSpace: "!example:example.org"
+#acceptInvitesFromSpace: "!qporfwt:example.com"
 
 # Whether Mjolnir should report ignored invites to the management room (if autojoinOnlyIfManager is true).
 recordIgnoredInvites: false
@@ -103,7 +103,7 @@ automaticallyRedactForReasons:
 #
 # Note: These must be matrix.to URLs
 #protectedRooms:
-#  - "https://matrix.to/#/#yourroom:example.org"
+#  - "https://matrix.to/#/#matrix:example.org"
 
 # Whether or not to add all joined rooms to the "protected rooms" list
 # (excluding the management room and watched policy list rooms, see below).

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

@@ -1,179 +0,0 @@
----
-# postmoogle is an email to matrix bot
-# Project source code URL: https://github.com/etkecc/postmoogle
-
-matrix_bot_postmoogle_enabled: true
-
-matrix_bot_postmoogle_container_image_self_build: false
-matrix_bot_postmoogle_docker_repo: "https://github.com/etkecc/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"
-
-# renovate: datasource=docker depName=ghcr.io/etkecc/postmoogle
-matrix_bot_postmoogle_version: v0.9.21
-matrix_bot_postmoogle_docker_image: "{{ matrix_bot_postmoogle_docker_image_name_prefix }}etkecc/postmoogle:{{ matrix_bot_postmoogle_version }}"
-matrix_bot_postmoogle_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_postmoogle_container_image_self_build else 'ghcr.io/' }}"
-matrix_bot_postmoogle_docker_image_force_pull: "{{ matrix_bot_postmoogle_docker_image.endswith(':latest') }}"
-
-matrix_bot_postmoogle_base_path: "{{ matrix_base_data_path }}/postmoogle"
-matrix_bot_postmoogle_config_path: "{{ matrix_bot_postmoogle_base_path }}/config"
-matrix_bot_postmoogle_data_path: "{{ matrix_bot_postmoogle_base_path }}/data"
-
-matrix_bot_postmoogle_container_network: ""
-
-matrix_bot_postmoogle_container_additional_networks: "{{ matrix_bot_postmoogle_container_additional_networks_auto + matrix_bot_postmoogle_container_additional_networks_custom }}"
-matrix_bot_postmoogle_container_additional_networks_auto: []
-matrix_bot_postmoogle_container_additional_networks_custom: []
-
-# A list of extra arguments to pass to the container
-matrix_bot_postmoogle_container_extra_arguments: []
-
-# List of systemd services that matrix-bot-postmoogle.service depends on
-matrix_bot_postmoogle_systemd_required_services_list: "{{ matrix_bot_postmoogle_systemd_required_services_list_default + matrix_bot_postmoogle_systemd_required_services_list_auto + matrix_bot_postmoogle_systemd_required_services_list_custom }}"
-matrix_bot_postmoogle_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
-matrix_bot_postmoogle_systemd_required_services_list_auto: []
-matrix_bot_postmoogle_systemd_required_services_list_custom: []
-
-# List of systemd services that matrix-bot-postmoogle.service wants
-matrix_bot_postmoogle_systemd_wanted_services_list: []
-
-# Database-related configuration fields.
-#
-# To use SQLite, stick to these defaults.
-#
-# To use Postgres:
-# - change the engine (`matrix_bot_postmoogle_database_engine: 'postgres'`)
-# - adjust your database credentials via the `matrix_bot_postmoogle_database_*` variables
-matrix_bot_postmoogle_database_engine: 'sqlite'
-
-matrix_bot_postmoogle_sqlite_database_path_local: "{{ matrix_bot_postmoogle_data_path }}/bot.db"
-matrix_bot_postmoogle_sqlite_database_path_in_container: "/data/bot.db"
-
-matrix_bot_postmoogle_database_username: 'postmoogle'
-matrix_bot_postmoogle_database_password: 'some-password'
-matrix_bot_postmoogle_database_hostname: ''
-matrix_bot_postmoogle_database_port: 5432
-matrix_bot_postmoogle_database_name: 'postmoogle'
-matrix_bot_postmoogle_database_sslmode: disable
-
-matrix_bot_postmoogle_database_connection_string: 'postgres://{{ matrix_bot_postmoogle_database_username }}:{{ matrix_bot_postmoogle_database_password }}@{{ matrix_bot_postmoogle_database_hostname }}:{{ matrix_bot_postmoogle_database_port }}/{{ matrix_bot_postmoogle_database_name }}?sslmode={{ matrix_bot_postmoogle_database_sslmode }}'
-
-matrix_bot_postmoogle_storage_database: "{{
-	{
-		'sqlite': matrix_bot_postmoogle_sqlite_database_path_in_container,
-		'postgres': matrix_bot_postmoogle_database_connection_string,
-	}[matrix_bot_postmoogle_database_engine]
-}}"
-
-matrix_bot_postmoogle_database_dialect: "{{
-  {
-    'sqlite': 'sqlite3',
-    'postgres': 'postgres',
-  }[matrix_bot_postmoogle_database_engine]
-}}"
-
-
-# The bot's username. This user needs to be created manually beforehand.
-# Also see `matrix_bot_postmoogle_password` or `matrix_bot_postmoogle_sharedsecret`
-matrix_bot_postmoogle_login: "postmoogle"
-
-# The password that the bot uses to authenticate.
-matrix_bot_postmoogle_password: ''
-
-# Alternative to password - shared secret requires matrix_bot_postmoogle_login to be MXID
-matrix_bot_postmoogle_sharedsecret: ''
-
-matrix_bot_postmoogle_homeserver: ""
-
-# Command prefix
-matrix_bot_postmoogle_prefix: '!pm'
-
-# Max email size in megabytes, including attachments
-matrix_bot_postmoogle_maxsize: '1024'
-
-# Optional SMTP relay mode
-matrix_bot_postmoogle_relay_host: ''
-matrix_bot_postmoogle_relay_port: ''
-matrix_bot_postmoogle_relay_username: ''
-matrix_bot_postmoogle_relay_password: ''
-
-# A list of admins
-# Example set of rules:
-# matrix_bot_postmoogle_admins:
-# - '@someone:example.com'
-# - '@another:example.com'
-# - '@bot.*:example.com'
-# - '@*:another.com'
-matrix_bot_postmoogle_admins: "{{ [matrix_admin] if matrix_admin else [] }}"
-
-# Sentry DSN. Deprecated, use matrix_bot_postmoogle_monitoring_sentry_dsn
-matrix_bot_postmoogle_sentry: ''
-
-# Sentry integration
-matrix_bot_postmoogle_monitoring_sentry_dsn: "{{ matrix_bot_postmoogle_sentry }}"
-matrix_bot_postmoogle_monitoring_sentry_rate: 20
-
-# healthchecks.io integration
-matrix_bot_postmoogle_monitoring_healthchecks_uuid: ''
-matrix_bot_postmoogle_monitoring_healthchecks_duration: 60
-
-# Log level
-matrix_bot_postmoogle_loglevel: 'INFO'
-
-# deprecated, use matrix_bot_postmoogle_domains
-matrix_bot_postmoogle_domain: "{{ matrix_server_fqn_matrix }}"
-
-matrix_bot_postmoogle_domains:
-  - "{{ matrix_bot_postmoogle_domain }}"  # backward compatibility
-
-# Password (passphrase) to encrypt account data
-matrix_bot_postmoogle_data_secret: ""
-
-# in-container ports
-matrix_bot_postmoogle_port: '2525'
-matrix_bot_postmoogle_tls_port: '25587'
-
-# on-host ports
-matrix_bot_postmoogle_smtp_host_bind_port: '25'
-matrix_bot_postmoogle_submission_host_bind_port: '587'
-
-### SSL
-## on-host SSL dir
-matrix_bot_postmoogle_ssl_path: ""
-
-## in-container SSL paths
-# matrix_bot_postmoogle_tls_cert is the SSL certificates' certificates.
-# This var is likely set via group_vars/matrix_servers, so you don't need to set certs manually.
-# If you do need to set it manually, note that this is an in-container path.
-# To mount a certificates volumes into the container, use matrix_bot_postmoogle_ssl_path
-# Example value: /ssl/live/{{ matrix_bot_postmoogle_domain }}/fullchain.pem
-matrix_bot_postmoogle_tls_cert: ""
-
-# matrix_bot_postmoogle_tls_key is the SSL certificates' keys.
-# This var is likely set via group_vars/matrix_servers, so you don't need to set keys manually.
-# If you do need to set it manually, note that this is an in-container path.
-# To mount a certificates volumes into the container, use matrix_bot_postmoogle_ssl_path
-# Example value: /ssl/live/{{ matrix_bot_postmoogle_domain }}/privkey.pem
-matrix_bot_postmoogle_tls_key: ""
-
-# Mandatory TLS, even on plain SMTP port
-matrix_bot_postmoogle_tls_required: false
-
-# trusted proxies
-matrix_bot_postmoogle_proxies: []
-
-# known forwarders
-matrix_bot_postmoogle_mailboxes_forwarded: []
-
-# reserved mailboxes
-matrix_bot_postmoogle_mailboxes_reserved: []
-
-# mailbox activation flow
-matrix_bot_postmoogle_mailboxes_activation: none
-
-# Additional environment variables to pass to the postmoogle container
-#
-# Example:
-# matrix_bot_postmoogle_environment_variables_extension: |
-#   postmoogle_TEXT_DONE=Done
-matrix_bot_postmoogle_environment_variables_extension: ''

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

@@ -1,94 +0,0 @@
----
-- when: "matrix_bot_postmoogle_database_engine == 'postgres'"
-  block:
-    - name: Check if an SQLite database already exists
-      ansible.builtin.stat:
-        path: "{{ matrix_bot_postmoogle_sqlite_database_path_local }}"
-      register: matrix_bot_postmoogle_sqlite_database_path_local_stat_result
-
-    - when: "matrix_bot_postmoogle_sqlite_database_path_local_stat_result.stat.exists | bool"
-      block:
-        - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
-            tasks_from: migrate_db_to_postgres
-          vars:
-            postgres_db_migration_request:
-              src: "{{ matrix_bot_postmoogle_sqlite_database_path_local }}"
-              dst: "{{ matrix_bot_postmoogle_database_connection_string }}"
-              caller: "{{ role_path | basename }}"
-              engine_variable_name: 'matrix_bot_postmoogle_database_engine'
-              engine_old: 'sqlite'
-              systemd_services_to_stop: ['matrix-bot-postmoogle.service']
-
-        - ansible.builtin.set_fact:
-            matrix_bot_postmoogle_requires_restart: true
-
-- name: Ensure postmoogle paths exist
-  ansible.builtin.file:
-    path: "{{ item.path }}"
-    state: directory
-    mode: 0750
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-  with_items:
-    - {path: "{{ matrix_bot_postmoogle_config_path }}", when: true}
-    - {path: "{{ matrix_bot_postmoogle_data_path }}", when: true}
-    - {path: "{{ matrix_bot_postmoogle_docker_src_files_path }}", when: matrix_bot_postmoogle_container_image_self_build}
-  when: "item.when | bool"
-
-- name: Ensure postmoogle environment variables file created
-  ansible.builtin.template:
-    src: "{{ role_path }}/templates/env.j2"
-    dest: "{{ matrix_bot_postmoogle_config_path }}/env"
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-    mode: 0640
-
-- name: Ensure postmoogle image is pulled
-  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 }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_postmoogle_docker_image_force_pull }}"
-  when: "not matrix_bot_postmoogle_container_image_self_build | bool"
-  register: result
-  retries: "{{ devture_playbook_help_container_retries_count }}"
-  delay: "{{ devture_playbook_help_container_retries_delay }}"
-  until: result is not failed
-
-- name: Ensure postmoogle repository is present on self-build
-  ansible.builtin.git:
-    repo: "{{ matrix_bot_postmoogle_docker_repo }}"
-    version: "{{ matrix_bot_postmoogle_docker_repo_version }}"
-    dest: "{{ matrix_bot_postmoogle_docker_src_files_path }}"
-    force: "yes"
-  become: true
-  become_user: "{{ matrix_user_username }}"
-  register: matrix_bot_postmoogle_git_pull_results
-  when: "matrix_bot_postmoogle_container_image_self_build | bool"
-
-- name: Ensure postmoogle image is built
-  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 }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_postmoogle_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_postmoogle_docker_src_files_path }}"
-      pull: true
-  when: "matrix_bot_postmoogle_container_image_self_build | bool"
-
-- name: Ensure postmoogle container network is created
-  community.general.docker_network:
-    enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
-    name: "{{ matrix_bot_postmoogle_container_network }}"
-    driver: bridge
-    driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
-
-- name: Ensure matrix-bot-postmoogle.service installed
-  ansible.builtin.template:
-    src: "{{ role_path }}/templates/systemd/matrix-bot-postmoogle.service.j2"
-    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-postmoogle.service"
-    mode: 0644
-  register: matrix_bot_postmoogle_systemd_service_result

roles/custom/matrix-bot-postmoogle/tasks/validate_config.yml

@@ -1,12 +0,0 @@
----
-
-- name: Fail if required Postmoogle settings not defined
-  ansible.builtin.fail:
-    msg: >-
-      You need to define a required configuration setting (`{{ item.name }}`).
-  when: "item.when | bool and vars[item.name] == ''"
-  with_items:
-    - {'name': 'matrix_bot_postmoogle_password', when: true}
-    - {'name': 'matrix_bot_postmoogle_container_network', when: true}
-    - {'name': 'matrix_bot_postmoogle_homeserver', when: true}
-    - {'name': 'matrix_bot_postmoogle_database_hostname', when: "{{ matrix_bot_postmoogle_database_engine == 'postgres' }}"}

roles/custom/matrix-bot-postmoogle/templates/env.j2

@@ -1,31 +0,0 @@
-POSTMOOGLE_LOGIN={{ matrix_bot_postmoogle_login }}
-POSTMOOGLE_PASSWORD={{ matrix_bot_postmoogle_password }}
-POSTMOOGLE_SHAREDSECRET={{ matrix_bot_postmoogle_sharedsecret }}
-POSTMOOGLE_HOMESERVER={{ matrix_bot_postmoogle_homeserver }}
-POSTMOOGLE_DOMAINS={{ matrix_bot_postmoogle_domains | join(' ') }}
-POSTMOOGLE_PORT={{ matrix_bot_postmoogle_port }}
-POSTMOOGLE_DB_DSN={{ matrix_bot_postmoogle_database_connection_string }}
-POSTMOOGLE_DB_DIALECT={{ matrix_bot_postmoogle_database_dialect }}
-POSTMOOGLE_PREFIX={{ matrix_bot_postmoogle_prefix }}
-POSTMOOGLE_MAXSIZE={{ matrix_bot_postmoogle_maxsize }}
-POSTMOOGLE_LOGLEVEL={{ matrix_bot_postmoogle_loglevel }}
-POSTMOOGLE_ADMINS={{ matrix_bot_postmoogle_admins | join(' ') }}
-POSTMOOGLE_TLS_PORT={{ matrix_bot_postmoogle_tls_port }}
-POSTMOOGLE_TLS_CERT={{ matrix_bot_postmoogle_tls_cert }}
-POSTMOOGLE_TLS_KEY={{ matrix_bot_postmoogle_tls_key }}
-POSTMOOGLE_TLS_REQUIRED={{ matrix_bot_postmoogle_tls_required }}
-POSTMOOGLE_DATA_SECRET={{ matrix_bot_postmoogle_data_secret }}
-POSTMOOGLE_PROXIES={{ matrix_bot_postmoogle_proxies | join(' ') }}
-POSTMOOGLE_RELAY_HOST={{ matrix_bot_postmoogle_relay_host }}
-POSTMOOGLE_RELAY_PORT={{ matrix_bot_postmoogle_relay_port }}
-POSTMOOGLE_RELAY_USERNAME={{ matrix_bot_postmoogle_relay_username }}
-POSTMOOGLE_RELAY_PASSWORD={{ matrix_bot_postmoogle_relay_password }}
-POSTMOOGLE_MONITORING_SENTRY_DSN={{ matrix_bot_postmoogle_monitoring_sentry_dsn }}
-POSTMOOGLE_MONITORING_SENTRY_RATE={{ matrix_bot_postmoogle_monitoring_sentry_rate }}
-POSTMOOGLE_MONITORING_HEALTHCHECKS_UUID={{ matrix_bot_postmoogle_monitoring_healthchecks_uuid }}
-POSTMOOGLE_MONITORING_HEALTHCHECKS_DURATION={{ matrix_bot_postmoogle_monitoring_healthchecks_duration }}
-POSTMOOGLE_MAILBOXES_FORWARDED={{ matrix_bot_postmoogle_mailboxes_forwarded | join(' ') }}
-POSTMOOGLE_MAILBOXES_RESERVED={{ matrix_bot_postmoogle_mailboxes_reserved | join(' ') }}
-POSTMOOGLE_MAILBOXES_ACTIVATION={{ matrix_bot_postmoogle_mailboxes_activation }}
-
-{{ matrix_bot_postmoogle_environment_variables_extension }}

roles/custom/matrix-bridge-appservice-discord/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # matrix-appservice-discord is a Matrix <-> Discord bridge
-# Project source code URL: https://github.com/Half-Shot/matrix-appservice-discord
+# Project source code URL: https://github.com/matrix-org/matrix-appservice-discord
 
 matrix_appservice_discord_enabled: false
 matrix_appservice_discord_container_image_self_build: false

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

@@ -13,7 +13,7 @@
     - when: "matrix_appservice_discord_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-appservice-discord/templates/config.yaml.j2

@@ -64,7 +64,7 @@ database:
   # You may either use SQLite or Postgresql for the bridge database, which contains
   # important mappings for events and user puppeting configurations.
   # Use the filename option for SQLite, or connString for Postgresql.
-  # If you are migrating, see https://github.com/Half-Shot/matrix-appservice-discord/blob/master/docs/howto.md#migrate-to-postgres-from-sqlite
+  # If you are migrating, see https://github.com/matrix-org/matrix-appservice-discord/blob/master/docs/howto.md#migrate-to-postgres-from-sqlite
   # WARNING: You will almost certainly be fine with sqlite unless your bridge
   # is in heavy demand and you suffer from IO slowness.
   {% if matrix_appservice_discord_database_engine == 'sqlite' %}

roles/custom/matrix-bridge-appservice-irc/defaults/main.yml

@@ -61,7 +61,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #   # The address of the server to connect to.
 #   irc.example.com:
 #     # A human-readable short name. This is used to label IRC status rooms
-#     # where matrix users control their connections.
+#     # where Matrix users control their connections.
 #     # E.g. 'ExampleNet IRC Bridge status'.
 #     # It is also used in the Third Party Lookup API as the instance `desc`
 #     # property, where each server is an instance.
@@ -77,7 +77,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #     # networkId: "example"
 
 #     # URL to an icon used as the network icon whenever this network appear in
-#     # a network list. (Like in the riot room directory, for instance.)
+#     # a network list. (Like in the Riot room directory, for instance.)
 #     # icon: https://example.com/images/hash.png
 
 #     # The port to connect to. Optional.
@@ -158,7 +158,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #       #
 #       # Join channels even if there are no Matrix users on the other side of
 #       # the bridge. Set to false to prevent the bot from joining channels which have no
-#       # real matrix users in them, even if there is a mapping for the channel.
+#       # real Matrix users in them, even if there is a mapping for the channel.
 #       # Default: true
 #       joinChannelsIfNoUsers: true
 
@@ -239,9 +239,9 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #       global:
 #         ircToMatrix:
 #           # Get a snapshot of all real IRC users on a channel (via NAMES) and
-#           # join their virtual matrix clients to the room.
+#           # join their virtual Matrix clients to the room.
 #           initial: false
-#           # Make virtual matrix clients join and leave rooms as their real IRC
+#           # Make virtual Matrix clients join and leave rooms as their real IRC
 #           # counterparts join/part channels. Default: false.
 #           incremental: false
 
@@ -256,7 +256,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 
 #       # Apply specific rules to Matrix rooms. Only matrix-to-IRC takes effect.
 #       rooms:
-#         - room: "!fuasirouddJoxtwfge:localhost"
+#         - room: "!qporfwt:localhost"
 #           matrixToIrc:
 #             initial: false
 #             incremental: false
@@ -270,25 +270,25 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 
 #     mappings:
 #       # 1:many mappings from IRC channels to room IDs on this IRC server.
-#       # The matrix room must already exist. Your matrix client should expose
+#       # The Matrix room must already exist. Your Matrix client should expose
 #       # the room ID in a "settings" page for the room.
 #       "#thepub":
-#         roomIds: ["!kieouiJuedJoxtVdaG:localhost"]
-#         # Channel key/password to use. Optional. If provided, matrix users do
+#         roomIds: ["!qporfwt:localhost"]
+#         # Channel key/password to use. Optional. If provided, Matrix users do
 #         # not need to know the channel key in order to join the channel.
 #         # key: "secret"
 
-#     # Configuration for virtual matrix users. The following variables are
+#     # Configuration for virtual Matrix users. The following variables are
 #     # exposed:
 #     # $NICK => The IRC nick
 #     # $SERVER => The IRC server address (e.g. "irc.example.com")
 #     matrixClients:
-#       # The user ID template to use when creating virtual matrix users. This
+#       # The user ID template to use when creating virtual Matrix users. This
 #       # MUST have $NICK somewhere in it.
 #       # Optional. Default: "@$SERVER_$NICK".
 #       # Example: "@irc.example.com_Alice:example.com"
 #       userTemplate: "@irc_$NICK"
-#       # The display name to use for created matrix clients. This should have
+#       # The display name to use for created Matrix clients. This should have
 #       # $NICK somewhere in it if it is specified. Can also use $SERVER to
 #       # insert the IRC domain.
 #       # Optional. Default: "$NICK (IRC)". Example: "Alice (IRC)"
@@ -333,7 +333,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #       # The maximum amount of time in seconds that the client can exist
 #       # without sending another message before being disconnected. Use 0 to
 #       # not apply an idle timeout. This value is ignored if this IRC server is
-#       # mirroring matrix membership lists to IRC. Default: 172800 (48 hours)
+#       # mirroring Matrix membership lists to IRC. Default: 172800 (48 hours)
 #       idleTimeout: 10800
 #       # The number of millseconds to wait between consecutive reconnections if a
 #       # client gets disconnected. Setting to 0 will cause the scheduling to be
@@ -353,7 +353,7 @@ matrix_appservice_irc_ircService_servers: []  # noqa var-naming
 #       concurrentReconnectLimit: 50
 #       # The number of lines to allow being sent by the IRC client that has received
 #       # a large block of text to send from matrix. If the number of lines that would
-#       # be sent is > lineLimit, the text will instead be uploaded to matrix and the
+#       # be sent is > lineLimit, the text will instead be uploaded to Matrix and the
 #       # resulting URI is treated as a file. As such, a link will be sent to the IRC
 #       # side instead of potentially spamming IRC and getting the IRC client kicked.
 #       # Default: 3.
@@ -412,7 +412,7 @@ matrix_appservice_irc_configuration: "{{ matrix_appservice_irc_configuration_yam
 #
 # We do this to ensure consistency:
 # - always having an up-to-date registration.yaml file (synced with the configuration file)
-# - always having the same AS/HS token and appservice id in the registration.yaml file
+# - always having the same AS/HS token and appservice ID in the registration.yaml file
 #
 # Learn more about this in `setup_install.yml`
 matrix_appservice_irc_registration_override_yaml: |

roles/custom/matrix-bridge-appservice-irc/tasks/migrate_nedb_to_postgres.yml

@@ -2,7 +2,7 @@
 
 - name: Fail if Postgres not enabled
   ansible.builtin.fail:
-    msg: "Postgres via the com.devture.ansible.role.postgres role is not enabled (`postgres_enabled`). Cannot migrate."
+    msg: "Postgres via ansible-role-postgres role is not enabled (`postgres_enabled`). Cannot migrate."
   when: "not postgres_enabled | bool"
 
 # Defaults
@@ -73,6 +73,6 @@
         devture_playbook_runtime_messages_list | default([])
         +
         [
-          "NOTE: Your appservice-irc database files have been imported into Postgres. The original database files have been moved from `{{ matrix_appservice_irc_data_path }}/*.db` to `{{ matrix_appservice_irc_data_path }}/*.db.backup`. When you've confirmed that the import went well and everything works, you should be able to safely delete these files."
+          "Note: Your appservice-irc database files have been imported into Postgres. The original database files have been moved from `{{ matrix_appservice_irc_data_path }}/*.db` to `{{ matrix_appservice_irc_data_path }}/*.db.backup`. When you've confirmed that the import went well and everything works, you should be able to safely delete these files."
         ]
       }}

roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2

@@ -26,7 +26,7 @@ homeserver:
   # is the "domain name" part of the HS URL.
   domain: {{ matrix_appservice_irc_homeserver_domain }}
 
-  # Should presence be enabled for matrix clients on this bridge. If disabled on the
+  # Should presence be enabled for Matrix clients on this bridge. If disabled on the
   # homeserver then it should also be disabled here to avoid excess traffic.
   # Default: true
   enablePresence: {{ matrix_appservice_irc_homeserver_enablePresence|to_json }}
@@ -41,23 +41,23 @@ ircService:
   #
   # The path to the RSA PEM-formatted private key to use when encrypting IRC passwords
   # for storage in the database. Passwords are stored by using the admin room command
-  # `!storepass server.name passw0rd. When a connection is made to IRC on behalf of
+  # `!storepass example.com passw0rd. When a connection is made to IRC on behalf of
   # the Matrix user, this password will be sent as the server password (PASS command).
   passwordEncryptionKeyPath: "/data/passkey.pem" # does not typically need modification
 
   # Config for Matrix -> IRC bridging
   matrixHandler:
-    # Cache this many matrix events in memory to be used for m.relates_to messages (usually replies).
+    # Cache this many Matrix events in memory to be used for m.relates_to messages (usually replies).
     eventCacheSize: 4096
 
   servers: {{ matrix_appservice_irc_ircService_servers|to_json }}
 
   # Configuration for an ident server. If you are running a public bridge it is
-  # advised you setup an ident server so IRC mods can ban specific matrix users
+  # advised you setup an ident server so IRC mods can ban specific Matrix users
   # rather than the application service itself.
   ident:
     # True to listen for Ident requests and respond with the
-    # matrix user's user_id (converted to ASCII, respecting RFC 1413).
+    # Matrix user's user_id (converted to ASCII, respecting RFC 1413).
     # Default: false.
     enabled: false
     # The port to listen on for incoming ident requests.

roles/custom/matrix-bridge-appservice-slack/defaults/main.yml

@@ -141,7 +141,7 @@ matrix_appservice_slack_configuration_extension_yaml: |
     # Optional
     #slack_master_token: "abc-123-def"
     # Optional
-    #matrix_admin_room: "!aBcDeF:matrix.org"
+    #matrix_admin_room: "!qporfwt:example.com"
     #homeserver:
     #    url: http://localhost:{{ matrix_synapse_container_client_api_port }}
     #    server_name: my.server

roles/custom/matrix-bridge-appservice-slack/tasks/migrate_nedb_to_postgres.yml

@@ -2,7 +2,7 @@
 
 - name: Fail if Postgres not enabled
   ansible.builtin.fail:
-    msg: "Postgres via the com.devture.ansible.role.postgres role is not enabled (`postgres_enabled`). Cannot migrate."
+    msg: "Postgres via ansible-role-postgres role is not enabled (`postgres_enabled`). Cannot migrate."
   when: "not postgres_enabled | bool"
 
 # Defaults
@@ -69,6 +69,6 @@
         devture_playbook_runtime_messages_list | default([])
         +
         [
-          "NOTE: Your appservice-slack database files have been imported into Postgres. The original database files have been moved from `{{ matrix_appservice_slack_data_path }}/*.db` to `{{ matrix_appservice_slack_data_path }}/*.db.backup`. When you've confirmed that the import went well and everything works, you should be able to safely delete these files."
+          "Note: Your appservice-slack database files have been imported into Postgres. The original database files have been moved from `{{ matrix_appservice_slack_data_path }}/*.db` to `{{ matrix_appservice_slack_data_path }}/*.db.backup`. When you've confirmed that the import went well and everything works, you should be able to safely delete these files."
         ]
       }}

roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2

@@ -87,7 +87,7 @@ manhole:
 
 # Bridge config
 bridge:
-    # Localpart template of MXIDs for LinkedIn  users.
+    # Localpart template of MXIDs for LinkedIn users.
     # {userid} is replaced with the user ID of the LinkedIn user
     username_template: "linkedin_{userid}"
     # Settings for creating a space for every user.
@@ -263,4 +263,3 @@ logging:
     root:
         level: {{ matrix_beeper_linkedin_logging_level|to_json }}
         handlers: [console]
-

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

@@ -13,7 +13,7 @@
     - when: "matrix_go_skype_bridge_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -82,7 +82,7 @@
     path: "{{ matrix_go_skype_bridge_base_path }}/go-skype-bridge.db"
   register: matrix_go_skype_bridge_stat_database
 
-- name: Check if an old matrix state file exists
+- name: Check if an old Matrix state file exists
   ansible.builtin.stat:
     path: "{{ matrix_go_skype_bridge_base_path }}/mx-state.json"
   register: matrix_go_skype_bridge_stat_mx_state

roles/custom/matrix-bridge-go-skype-bridge/templates/config.yaml.j2

@@ -109,7 +109,7 @@ bridge:
 
     # Number of chats to sync for new users.
     # Since some of the obtained conversations are not the conversations that the user needs to see,
-    # the actual number of conversations displayed on the matrix client will be slightly less than the set value
+    # the actual number of conversations displayed on the Matrix client will be slightly less than the set value
     initial_chat_sync_count: 10
     # Number of old messages to fill when creating new portal rooms.
     initial_history_fill_count: 20
@@ -181,7 +181,7 @@ bridge:
         default: {{ matrix_go_skype_bridge_bridge_encryption_default|to_json }}
 
         puppet_id:
-            # when set to true, the matrixid of the contact (puppet) from the bridge to the matrix will be encrypted into another string
+            # when set to true, the matrixid of the contact (puppet) from the bridge to the Matrix will be encrypted into another string
             allow: false
             # 8 characters
             key: '12dsf323'
@@ -205,7 +205,7 @@ bridge:
         # The management room for the bot. This is where all status notifications are posted and
         # in this room, you can use `!wa <command>` instead of `!wa relaybot <command>`. Omitting
         # the command prefix completely like in user management rooms is not possible.
-        management: '!foo:example.com'
+        management: '!qporfwt:example.com'
         # List of users to invite to all created rooms that include the relaybot.
         invites: []
         # The formats to use when sending messages to Skype via the relaybot.

roles/custom/matrix-bridge-heisenbridge/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# heisenbridge is a bouncer-style Matrix IRC bridge
+# Heisenbridge is a bouncer-style Matrix IRC bridge
 # Project source code URL: https://github.com/hifi/heisenbridge
 
 matrix_heisenbridge_enabled: true
@@ -93,7 +93,7 @@ matrix_heisenbridge_registration_yaml_heisenbridge:
   displayname: "{{ matrix_heisenbridge_config_displayname }}"
 
 # Default registration file consumed by both the homeserver and Heisenbridge.
-# Besides registration information, it contains configuration (see the heisenbridge key).
+# Besides registration information, it contains configuration (see the Heisenbridge key).
 matrix_heisenbridge_registration_yaml:
   id: heisenbridge
   url: http://matrix-heisenbridge:9898

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

@@ -1,6 +1,6 @@
 ---
 
-- name: Ensure heisenbridge image is pulled
+- name: Ensure Heisenbridge image is pulled
   community.docker.docker_image:
     name: "{{ matrix_heisenbridge_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -11,7 +11,7 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure heisenbridge paths exist
+- name: Ensure Heisenbridge paths exist
   ansible.builtin.file:
     path: "{{ item }}"
     state: directory
@@ -21,7 +21,7 @@
   with_items:
     - "{{ matrix_heisenbridge_base_path }}"
 
-- name: Ensure heisenbridge registration.yaml installed if provided
+- name: Ensure Heisenbridge registration.yaml installed if provided
   ansible.builtin.copy:
     content: "{{ matrix_heisenbridge_registration | to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_heisenbridge_base_path }}/registration.yaml"
@@ -29,7 +29,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
-- name: Ensure heisenbridge support files installed
+- name: Ensure Heisenbridge support files installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/{{ item }}.j2"
     dest: "{{ matrix_heisenbridge_base_path }}/{{ item }}"
@@ -39,7 +39,7 @@
   with_items:
     - labels
 
-- name: Ensure heisenbridge container network is created
+- name: Ensure Heisenbridge container network is created
   community.general.docker_network:
     enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
     name: "{{ matrix_heisenbridge_container_network }}"

roles/custom/matrix-bridge-heisenbridge/tasks/validate_config.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Fail if required heisenbridge settings not defined
+- name: Fail if required Heisenbridge settings not defined
   ansible.builtin.fail:
     msg: >-
       You need to define a required configuration setting (`{{ item.name }}`).

roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml

@@ -102,7 +102,7 @@
   ansible.builtin.fail:
     msg: >-
       Your configuration contains a variable (`{{ item }}`), which refers to the old metrics collection system for Hookshot,
-      which exposed metrics on `https://stats.DOMAIN/hookshot/metrics`.
+      which exposed metrics on `https://stats.example.com/hookshot/metrics`.
 
       We now recommend exposing Hookshot metrics in another way, from another URL.
       Refer to the changelog for more details: https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/CHANGELOG.md#2022-06-22

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_mautrix_discord_container_image_self_build_repo: "https://mau.dev/mautrix
 matrix_mautrix_discord_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_discord_version == 'latest' else matrix_mautrix_discord_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/discord
-matrix_mautrix_discord_version: v0.7.0
+matrix_mautrix_discord_version: v0.7.1
 
 # See: https://mau.dev/mautrix/discord/container_registry
 matrix_mautrix_discord_docker_image: "{{ matrix_mautrix_discord_docker_image_name_prefix }}mautrix/discord:{{ matrix_mautrix_discord_version }}"
@@ -153,6 +153,6 @@ matrix_mautrix_discord_bridge_encryption_allow: "{{ matrix_bridges_encryption_en
 matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}"
 matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}"
 
-# On conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge.
+# On Conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge.
 # Setting this to false fixed the issue.
 matrix_mautrix_discord_bridge_restricted_rooms: true

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_discord_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_facebook_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mautrix-facebook/tasks/validate_config.yml

@@ -34,6 +34,6 @@
             devture_playbook_runtime_messages_list | default([])
             +
             [
-              "NOTE: Your mautrix-facebook bridge is still on SQLite and on the last version that supported it, before support was dropped. Support has been subsequently re-added in v0.3.2, so we advise you to upgrade (by removing your `matrix_mautrix_facebook_docker_image` definition from vars.yml)"
+              "Note: Your mautrix-facebook bridge is still on SQLite and on the last version that supported it, before support was dropped. Support has been subsequently re-added in v0.3.2, so we advise you to upgrade (by removing your `matrix_mautrix_facebook_docker_image` definition from vars.yml)"
             ]
           }}

roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_mautrix_gmessages_container_image_self_build_repo: "https://github.com/ma
 matrix_mautrix_gmessages_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_gmessages_version == 'latest' else matrix_mautrix_gmessages_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/gmessages
-matrix_mautrix_gmessages_version: v0.5.0
+matrix_mautrix_gmessages_version: v0.5.2
 
 # See: https://mau.dev/mautrix/gmessages/container_registry
 matrix_mautrix_gmessages_docker_image: "{{ matrix_mautrix_gmessages_docker_image_name_prefix }}mautrix/gmessages:{{ matrix_mautrix_gmessages_version }}"
@@ -148,6 +148,8 @@ matrix_mautrix_gmessages_bridge_encryption_default: "{{ matrix_bridges_encryptio
 matrix_mautrix_gmessages_bridge_encryption_require: false
 matrix_mautrix_gmessages_bridge_encryption_appservice: false
 matrix_mautrix_gmessages_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_gmessages_bridge_encryption_allow }}"
+# For compatibility with the older Gmessages bridge, you may wish to set the pickle key to: "go.mau.fi/mautrix-gmessages"
+matrix_mautrix_gmessages_bridge_encryption_pickle_key: mautrix.bridge.e2ee
 
 matrix_mautrix_gmessages_network_displayname_template: "{% raw %}{{or .FullName .PhoneNumber}}{% endraw %}"
 matrix_mautrix_gmessages_appservice_username_template: "{% raw %}gmessages_{{.}}{% endraw %}"

roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_gmessages_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -82,7 +82,7 @@
     path: "{{ matrix_mautrix_gmessages_base_path }}/mautrix-gmessages.db"
   register: matrix_mautrix_gmessages_stat_database
 
-- name: Check if an old matrix state file exists
+- name: Check if an old Matrix state file exists
   ansible.builtin.stat:
     path: "{{ matrix_mautrix_gmessages_base_path }}/mx-state.json"
   register: matrix_mautrix_gmessages_stat_mx_state

roles/custom/matrix-bridge-mautrix-gmessages/templates/config.yaml.j2

@@ -359,7 +359,7 @@ encryption:
     allow_key_sharing: {{ matrix_mautrix_gmessages_bridge_encryption_key_sharing_allow | to_json }}
     # Pickle key for encrypting encryption keys in the bridge database.
     # If set to generate, a random key will be generated.
-    pickle_key: mautrix.bridge.e2ee
+    pickle_key: {{ matrix_mautrix_gmessages_bridge_encryption_pickle_key | to_json }}
     # Options for deleting megolm sessions from the bridge.
     delete_keys:
         # Beeper-specific: delete outbound sessions when hungryserv confirms

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_googlechat_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_hangouts_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml

@@ -13,7 +13,7 @@ matrix_mautrix_meta_instagram_enabled: true
 matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
-matrix_mautrix_meta_instagram_version: v0.4.0
+matrix_mautrix_meta_instagram_version: v0.4.2
 
 matrix_mautrix_meta_instagram_base_path: "{{ matrix_base_data_path }}/mautrix-meta-instagram"
 matrix_mautrix_meta_instagram_config_path: "{{ matrix_mautrix_meta_instagram_base_path }}/config"
@@ -114,10 +114,10 @@ matrix_mautrix_meta_instagram_appservice_address: "http://{{ matrix_mautrix_meta
 
 matrix_mautrix_meta_instagram_appservice_id: "{{ matrix_mautrix_meta_instagram_meta_mode }}"
 
-# For Facebook/Messenger, we use the same `@messengerbot:DOMAIN` username regardless of how bridging happens for multiple reasons:
+# For Facebook/Messenger, we use the same `@messengerbot:example.com` username regardless of how bridging happens for multiple reasons:
 # - it's consistent - regardless of how bridging happens, the bridged service is actually Messenger
-# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:DOMAIN`
-# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:DOMAIN`
+# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:example.com`
+# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:example.com`
 # - `matrix_mautrix_meta_instagram_appservice_avatar` only has icons for Messenger and Instagram, not Facebook
 matrix_mautrix_meta_instagram_appservice_username_prefix: |-
   {{

roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_meta_instagram_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2

@@ -9,7 +9,7 @@ network:
     # * messenger - connect to FB Messenger via messenger.com (can be used with the facebook side deactivated)
     # * instagram - connect to Instagram DMs via instagram.com
     #
-    # Remember to change the appservice id, bot profile info, bridge username_template and management_room_text too.
+    # Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too.
     mode: {{ matrix_mautrix_meta_instagram_meta_mode | to_json }}
 
     # When in Instagram mode, should the bridge connect to WhatsApp servers for encrypted chats?

roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml

@@ -13,7 +13,7 @@ matrix_mautrix_meta_messenger_enabled: true
 matrix_mautrix_meta_messenger_identifier: matrix-mautrix-meta-messenger
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
-matrix_mautrix_meta_messenger_version: v0.4.0
+matrix_mautrix_meta_messenger_version: v0.4.2
 
 matrix_mautrix_meta_messenger_base_path: "{{ matrix_base_data_path }}/mautrix-meta-messenger"
 matrix_mautrix_meta_messenger_config_path: "{{ matrix_mautrix_meta_messenger_base_path }}/config"
@@ -114,10 +114,10 @@ matrix_mautrix_meta_messenger_appservice_address: "http://{{ matrix_mautrix_meta
 
 matrix_mautrix_meta_messenger_appservice_id: "{{ matrix_mautrix_meta_messenger_meta_mode }}"
 
-# For Facebook/Messenger, we use the same `@messengerbot:DOMAIN` username regardless of how bridging happens for multiple reasons:
+# For Facebook/Messenger, we use the same `@messengerbot:example.com` username regardless of how bridging happens for multiple reasons:
 # - it's consistent - regardless of how bridging happens, the bridged service is actually Messenger
-# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:DOMAIN`
-# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:DOMAIN`
+# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:example.com`
+# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:example.com`
 # - `matrix_mautrix_meta_messenger_appservice_avatar` only has icons for Messenger and Instagram, not Facebook
 matrix_mautrix_meta_messenger_appservice_username_prefix: |-
   {{

roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_meta_messenger_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2

@@ -9,7 +9,7 @@ network:
     # * messenger - connect to FB Messenger via messenger.com (can be used with the facebook side deactivated)
     # * instagram - connect to Instagram DMs via instagram.com
     #
-    # Remember to change the appservice id, bot profile info, bridge username_template and management_room_text too.
+    # Remember to change the appservice ID, bot profile info, bridge username_template and management_room_text too.
     mode: {{ matrix_mautrix_meta_messenger_meta_mode | to_json }}
 
     # When in Instagram mode, should the bridge connect to WhatsApp servers for encrypted chats?

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

@@ -9,7 +9,7 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/
 matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/signal
-matrix_mautrix_signal_version: v0.7.1
+matrix_mautrix_signal_version: v0.7.3
 
 # See: https://mau.dev/mautrix/signal/container_registry
 matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}"

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_signal_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -82,7 +82,7 @@
     path: "{{ matrix_mautrix_signal_base_path }}/mautrix-signal.db"
   register: matrix_mautrix_signal_stat_database
 
-- name: Check if an old matrix state file exists
+- name: Check if an old Matrix state file exists
   ansible.builtin.stat:
     path: "{{ matrix_mautrix_signal_base_path }}/mx-state.json"
   register: matrix_mautrix_signal_stat_mx_state

roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_mautrix_slack_container_image_self_build_repo: "https://mau.dev/mautrix/s
 matrix_mautrix_slack_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_slack_version == 'latest' else matrix_mautrix_slack_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/slack
-matrix_mautrix_slack_version: v0.1.1
+matrix_mautrix_slack_version: v0.1.3
 # See: https://mau.dev/mautrix/slack/container_registry
 matrix_mautrix_slack_docker_image: "{{ matrix_mautrix_slack_docker_image_name_prefix }}mautrix/slack:{{ matrix_mautrix_slack_version }}"
 matrix_mautrix_slack_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_slack_container_image_self_build else 'dock.mau.dev/' }}"

roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_slack_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_telegram_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_mautrix_whatsapp_container_image_self_build_repo: "https://mau.dev/mautri
 matrix_mautrix_whatsapp_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_whatsapp_version == 'latest' else matrix_mautrix_whatsapp_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/whatsapp
-matrix_mautrix_whatsapp_version: v0.10.9
+matrix_mautrix_whatsapp_version: v0.11.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 }}"
@@ -122,7 +122,7 @@ matrix_mautrix_whatsapp_database_connection_string: 'postgresql://{{ matrix_maut
 
 matrix_mautrix_whatsapp_appservice_database_type: "{{
 	{
-		'sqlite': 'sqlite3',
+		'sqlite': 'sqlite3-fk-wal',
 		'postgres':'postgres',
 	}[matrix_mautrix_whatsapp_database_engine]
 }}"
@@ -134,19 +134,24 @@ matrix_mautrix_whatsapp_appservice_database_uri: "{{
 	}[matrix_mautrix_whatsapp_database_engine]
 }}"
 
-matrix_mautrix_whatsapp_bridge_login_shared_secret_map: "{{ matrix_mautrix_whatsapp_bridge_login_shared_secret_map_auto | combine(matrix_mautrix_whatsapp_bridge_login_shared_secret_map_custom) }}"
-matrix_mautrix_whatsapp_bridge_login_shared_secret_map_auto: {}
-matrix_mautrix_whatsapp_bridge_login_shared_secret_map_custom: {}
+matrix_mautrix_whatsapp_double_puppet_secrets: "{{ matrix_mautrix_whatsapp_double_puppet_secrets_auto | combine(matrix_mautrix_whatsapp_double_puppet_secrets_custom) }}"
+matrix_mautrix_whatsapp_double_puppet_secrets_auto: {}
+matrix_mautrix_whatsapp_double_puppet_secrets_custom: {}
 
 # Enable End-to-bridge encryption
 matrix_mautrix_whatsapp_bridge_encryption_allow: "{{ matrix_bridges_encryption_enabled }}"
 matrix_mautrix_whatsapp_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}"
+matrix_mautrix_whatsapp_bridge_encryption_require: false
 matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}"
+# This pickle key value is backward-compatible with the old bridge.
+# See: https://github.com/mautrix/whatsapp/blob/v0.11.0/cmd/mautrix-whatsapp/legacymigrate.go#L44
+matrix_mautrix_whatsapp_bridge_encryption_pickle_key: maunium.net/go/mautrix-whatsapp
 
 matrix_mautrix_whatsapp_bridge_personal_filtering_spaces: true
-matrix_mautrix_whatsapp_bridge_mute_bridging: true
-matrix_mautrix_whatsapp_bridge_enable_status_broadcast: false
-matrix_mautrix_whatsapp_bridge_allow_user_invite: true
+matrix_mautrix_whatsapp_bridge_enable_status_broadcast: true
+
+matrix_mautrix_whatsapp_provisioning_shared_secret: ''
+matrix_mautrix_whatsapp_public_media_signing_key: ''
 
 matrix_mautrix_whatsapp_bridge_permissions: |
   {{
@@ -160,6 +165,12 @@ matrix_mautrix_whatsapp_bridge_relay_enabled: "{{ matrix_bridges_relay_enabled }
 # Only allow admins on this home server to set themselves as a relay user
 matrix_mautrix_whatsapp_bridge_relay_admin_only: true
 
+# List of user login IDs which anyone can set as a relay, as long as the relay user is in the room.
+matrix_mautrix_whatsapp_bridge_relay_default_relays: []
+
+# Controls whether to do backfilling at all.
+matrix_mautrix_whatsapp_backfill_enabled: true
+
 # Default mautrix-whatsapp configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
 #

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

@@ -13,7 +13,7 @@
     - when: "matrix_mautrix_whatsapp_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:
@@ -82,7 +82,7 @@
     path: "{{ matrix_mautrix_whatsapp_base_path }}/mautrix-whatsapp.db"
   register: matrix_mautrix_whatsapp_stat_database
 
-- name: Check if an old matrix state file exists
+- name: Check if an old Matrix state file exists
   ansible.builtin.stat:
     path: "{{ matrix_mautrix_whatsapp_base_path }}/mx-state.json"
   register: matrix_mautrix_whatsapp_stat_mx_state

roles/custom/matrix-bridge-mautrix-whatsapp/tasks/validate_config.yml

@@ -20,3 +20,7 @@
   with_items:
     - {'old': 'matrix_mautrix_whatsapp_log_level', 'new': 'matrix_mautrix_whatsapp_logging_level'}
     - {'old': 'matrix_mautrix_whatsapp_login_shared_secret', 'new': '<removed>'}
+    - {'old': 'matrix_mautrix_whatsapp_bridge_login_shared_secret_map', 'new': '<superseded by matrix_mautrix_whatsapp_double_puppet_secrets>'}
+    - {'old': 'matrix_mautrix_whatsapp_bridge_double_puppet_server_map', 'new': '<removed>'}
+    - {'old': 'matrix_mautrix_whatsapp_bridge_allow_user_invite', 'new': '<removed>'}
+    - {'old': 'matrix_mautrix_whatsapp_bridge_mute_bridging', 'new': '<removed>'}

roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2

@@ -1,261 +1,37 @@
 #jinja2: lstrip_blocks: "True"
-# Homeserver details.
-homeserver:
-    # The address that this appservice can use to connect to the homeserver.
-    address: {{ matrix_mautrix_whatsapp_homeserver_address }}
-    # The domain of the homeserver (for MXIDs, etc).
-    domain: {{ matrix_mautrix_whatsapp_homeserver_domain }}
-    # What software is the homeserver running?
-    # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
-    software: standard
-    # The URL to push real-time bridge status to.
-    # If set, the bridge will make POST requests to this URL whenever a user's whatsapp connection state changes.
-    # The bridge will use the appservice as_token to authorize requests.
-    status_endpoint: null
-    # Endpoint for reporting per-message status.
-    message_send_checkpoint_endpoint: null
-    # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246?
-    async_media: false
-
-# Application service host/registration related details.
-# Changing these values requires regeneration of the registration.
-appservice:
-    # The address that the homeserver can use to connect to this appservice.
-    address: {{ matrix_mautrix_whatsapp_appservice_address }}
-    # The hostname and port where this appservice should listen.
-    hostname: 0.0.0.0
-    port: 8080
-    # Database config.
-    database:
-        # The database type. "sqlite3" and "postgres" are supported.
-        type: {{ matrix_mautrix_whatsapp_appservice_database_type|to_json }}
-        # The database URI.
-        #   SQLite: File name is enough. https://github.com/mattn/go-sqlite3#connection-string
-        #   Postgres: Connection string. For example, postgres://user:password@host/database?sslmode=disable
-        #             To connect via Unix socket, use something like postgres:///dbname?host=/var/run/postgresql
-        uri: {{ matrix_mautrix_whatsapp_appservice_database_uri|to_json }}
-        # Maximum number of connections. Mostly relevant for Postgres.
-        max_open_conns: 20
-        max_idle_conns: 2
-        # Maximum connection idle time and lifetime before they're closed. Disabled if null.
-        # Parsed with https://pkg.go.dev/time#ParseDuration
-        max_conn_idle_time: null
-        max_conn_lifetime: null
-    # The unique ID of this appservice.
-    id: whatsapp
-    # Appservice bot details.
-    bot:
-        # Username of the appservice bot.
-        username: {{ matrix_mautrix_whatsapp_appservice_bot_username|to_json }}
-        # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
-        # to leave display name/avatar as-is.
-        displayname: WhatsApp bridge bot
-        avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr
-
-    # Whether or not to receive ephemeral events via appservice transactions.
-    # Requires MSC2409 support (i.e. Synapse 1.22+).
-    ephemeral_events: true
-
-    # Should incoming events be handled asynchronously?
-    # This may be necessary for large public instances with lots of messages going through.
-    # However, messages will not be guaranteed to be bridged in the same order they were sent in.
-    async_transactions: false
-
-    # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
-    as_token: "{{ matrix_mautrix_whatsapp_appservice_token }}"
-    hs_token: "{{ matrix_mautrix_whatsapp_homeserver_token }}"
-
-# Prometheus config.
-metrics:
-    # Enable prometheus metrics?
-    enabled: {{ matrix_mautrix_whatsapp_metrics_enabled | to_json }}
-    # IP and port where the metrics listener should be. The path is always /metrics
-    listen: 0.0.0.0:8001
-
-# Config for things that are directly sent to WhatsApp.
-whatsapp:
+# Network-specific config options
+network:
     # Device name that's shown in the "WhatsApp Web" section in the mobile app.
     os_name: Mautrix-WhatsApp bridge
     # Browser name that determines the logo shown in the mobile app.
     # Must be "unknown" for a generic icon or a valid browser name if you want a specific icon.
-    # List of valid browser names: https://github.com/tulir/whatsmeow/blob/8b34d886d543b72e5f4699cf5b2797f68d598f78/binary/proto/def.proto#L38-L51
+    # List of valid browser names: https://github.com/tulir/whatsmeow/blob/efc632c008604016ddde63bfcfca8de4e5304da9/binary/proto/def.proto#L43-L64
     browser_name: unknown
 
-# Bridge config
-bridge:
-    # Localpart template of MXIDs for WhatsApp users.
-    # {{ '{{.}}' }} is replaced with the phone number of the WhatsApp user.
-    username_template: "{{ 'whatsapp_{{.}}' }}"
+    # Proxy to use for all WhatsApp connections.
+    proxy: null
+    # Alternative to proxy: an HTTP endpoint that returns the proxy URL to use for WhatsApp connections.
+    get_proxy_url: null
+    # Whether the proxy options should only apply to the login websocket and not to authenticated connections.
+    proxy_only_login: false
+
     # Displayname template for WhatsApp users.
-    # {{ '{{.PushName}}' }}     - nickname set by the WhatsApp user
-    # {{ '{{.BusinessName}}' }} - validated WhatsApp business name
-    # {{ '{{.Phone}}' }}        - phone number (international format)
-    # The following variables are also available, but will cause problems on multi-user instances:
-    # {{ '{{.FullName}}' }}  - full name from contact list
-    # {{ '{{.FirstName}}' }} - first name from contact list
-    displayname_template: "{{ '{{or .BusinessName .PushName .JID}} (WhatsApp)' }}"
-    # Should the bridge create a space for each logged-in user and add bridged rooms to it?
-    # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time.
-    personal_filtering_spaces: {{ matrix_mautrix_whatsapp_bridge_personal_filtering_spaces | to_json }}
-    # Should the bridge send a read receipt from the bridge bot when a message has been sent to WhatsApp?
-    delivery_receipts: false
-    # Whether the bridge should send the message status as a custom com.beeper.message_send_status event.
-    message_status_events: false
-    # Whether the bridge should send error notices via m.notice events when a message fails to bridge.
-    message_error_notices: true
+    # {% raw %}
+    # {{.PushName}}     - nickname set by the WhatsApp user
+    # {{.BusinessName}} - validated WhatsApp business name
+    # {{.Phone}}        - phone number (international format)
+    # {{.FullName}}     - Name you set in the contacts list
+    # {% endraw %}
+    displayname_template: "{% raw %}{{or .BusinessName .PushName .Phone}} (WA){% endraw %}"
+
     # Should incoming calls send a message to the Matrix room?
     call_start_notices: true
     # Should another user's cryptographic identity changing send a message to Matrix?
     identity_change_notices: false
-    portal_message_buffer: 128
-    # Settings for handling history sync payloads.
-    history_sync:
-        # Enable backfilling history sync payloads from WhatsApp?
-        backfill: true
-        # The maximum number of initial conversations that should be synced.
-        # Other conversations will be backfilled on demand when receiving a message or when initiating a direct chat.
-        max_initial_conversations: -1
-        # Maximum number of messages to backfill in each conversation.
-        # Set to -1 to disable limit.
-        message_count: 50
-        # Should the bridge request a full sync from the phone when logging in?
-        # This bumps the size of history syncs from 3 months to 1 year.
-        request_full_sync: false
-        # Configuration parameters that are sent to the phone along with the request full sync flag.
-        # By default (when the values are null or 0), the config isn't sent at all.
-        full_sync_config:
-            # Number of days of history to request.
-            # The limit seems to be around 3 years, but using higher values doesn't break.
-            days_limit: null
-            # This is presumably the maximum size of the transferred history sync blob, which may affect what the phone includes in the blob.
-            size_mb_limit: null
-            # This is presumably the local storage quota, which may affect what the phone includes in the history sync blob.
-            storage_quota_mb: null
-        # 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
-
-        ###############################################################################
-        # The settings below are only applicable for backfilling using batch sending, #
-        # which is no longer supported in Synapse.                                    #
-        ###############################################################################
-
-        # Settings for media requests. If the media expired, then it will not
-        # be on the WA servers.
-        # Media can always be requested by reacting with the ♻️ (recycle) emoji.
-        # These settings determine if the media requests should be done
-        # automatically during or after backfill.
-        media_requests:
-            # Should expired media be automatically requested from the server as
-            # part of the backfill process?
-            auto_request_media: true
-            # Whether to request the media immediately after the media message
-            # is backfilled ("immediate") or at a specific time of the day
-            # ("local_time").
-            request_method: immediate
-            # If request_method is "local_time", what time should the requests
-            # be sent (in minutes after midnight)?
-            request_local_time: 120
-        # 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
-        # that you can continue conversations without loosing context.
-        immediate:
-            # The number of concurrent backfill workers to create for immediate
-            # backfills. Note that using more than one worker could cause the
-            # room list to jump around since there are no guarantees about the
-            # order in which the backfills will complete.
-            worker_count: 1
-            # The maximum number of events to backfill initially.
-            max_events: 10
-        # Settings for deferred backfills. The purpose of these backfills are
-        # to fill in the rest of the chat history that was not covered by the
-        # immediate backfills. These backfills generally should happen at a
-        # slower pace so as not to overload the homeserver.
-        # Each deferred backfill config should define a "stage" of backfill
-        # (i.e. the last week of messages). The fields are as follows:
-        # - start_days_ago: the number of days ago to start backfilling from.
-        #     To indicate the start of time, use -1. For example, for a week ago, use 7.
-        # - max_batch_events: the number of events to send per batch.
-        # - batch_delay: the number of seconds to wait before backfilling each batch.
-        deferred:
-            # Last Week
-            - start_days_ago: 7
-              max_batch_events: 20
-              batch_delay: 5
-            # Last Month
-            - start_days_ago: 30
-              max_batch_events: 50
-              batch_delay: 10
-            # Last 3 months
-            - start_days_ago: 90
-              max_batch_events: 100
-              batch_delay: 10
-            # The start of time
-            - start_days_ago: -1
-              max_batch_events: 500
-              batch_delay: 10
-              
-    # Should puppet avatars be fetched from the server even if an avatar is already set?
-    user_avatar_sync: true
-    # Should Matrix users leaving groups be bridged to WhatsApp?
-    bridge_matrix_leave: true
-    # Should the bridge update the m.direct account data event when double puppeting is enabled.
-    # Note that updating the m.direct event is not atomic (except with mautrix-asmux)
-    # and is therefore prone to race conditions.
-    sync_direct_chat_list: false
-    # Should the bridge use MSC2867 to bridge manual "mark as unread"s from
-    # WhatsApp and set the unread status on initial backfill?
-    # This will only work on clients that support the m.marked_unread or
-    # com.famedly.marked_unread room account data.
-    sync_manual_marked_unread: true
-    # When double puppeting is enabled, users can use `!wa toggle` to change whether
-    # presence and read receipts are bridged. These settings set the default values.
-    # Existing users won't be affected when these are changed.
-    default_bridge_presence: true
     # Send the presence as "available" to whatsapp when users start typing on a portal.
     # This works as a workaround for homeservers that do not support presence, and allows
     # users to see when the whatsapp user on the other side is typing during a conversation.
     send_presence_on_typing: false
-    # Should the bridge always send "active" delivery receipts (two gray ticks on WhatsApp)
-    # even if the user isn't marked as online (e.g. when presence bridging isn't enabled)?
-    #
-    # By default, the bridge acts like WhatsApp web, which only sends active delivery
-    # receipts when it's in the foreground.
-    force_active_delivery_receipts: false
-    # Servers to always allow double puppeting from
-    double_puppet_server_map:
-        "{{ matrix_mautrix_whatsapp_homeserver_domain }}": {{ matrix_mautrix_whatsapp_homeserver_address }}
-    # Allow using double puppeting from any server with a valid client .well-known file.
-    double_puppet_allow_discovery: false
-    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
-    #
-    # If set, double puppeting will be enabled automatically for local users
-    # instead of users having to find an access token and run `login-matrix`
-    # 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: default
-    # 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.
-    # This field will automatically be changed back to false after it, except if the config file is not writable.
-    resend_bridge_info: false
-    # When using double puppeting, should muted chats be muted in Matrix?
-    mute_bridging: {{ matrix_mautrix_whatsapp_bridge_mute_bridging | to_json }}
-    # When using double puppeting, should archived chats be moved to a specific tag in Matrix?
-    # Note that WhatsApp unarchives chats when a message is received, which will also be mirrored to Matrix.
-    # This can be set to a tag (e.g. m.lowpriority), or null to disable.
-    archive_tag: null
-    # Same as above, but for pinned chats. The favorite tag is called m.favourite
-    pinned_tag: null
-    # Should mute status and tags only be bridged when the portal room is created?
-    tag_only_on_create: true
     # Should WhatsApp status messages be bridged into a Matrix room?
     # Disabling this won't affect already created status broadcast rooms.
     enable_status_broadcast: {{ matrix_mautrix_whatsapp_bridge_enable_status_broadcast | to_json }}
@@ -270,189 +46,470 @@ bridge:
     # Should the bridge use thumbnails from WhatsApp?
     # They're disabled by default due to very low resolution.
     whatsapp_thumbnail: false
-    # Allow invite permission for user. User can invite any bots to room with whatsapp
-    # users (private chat and groups)
-    allow_user_invite: {{ matrix_mautrix_whatsapp_bridge_allow_user_invite | to_json }}
-    # Whether or not created rooms should have federation enabled.
-    # If false, created portal rooms will never be federated.
-    federate_rooms: {{ matrix_mautrix_whatsapp_federate_rooms|to_json }}
-    # Should the bridge never send alerts to the bridge management room?
-    # These are mostly things like the user being logged out.
-    disable_bridge_alerts: false
-    # Should the bridge stop if the WhatsApp server says another user connected with the same session?
-    # This is only safe on single-user bridges.
-    crash_on_stream_replaced: false
     # Should the bridge detect URLs in outgoing messages, ask the homeserver to generate a preview,
     # and send it to WhatsApp? URL previews can always be sent using the `com.beeper.linkpreviews`
     # key in the event content even if this is disabled.
     url_previews: false
-    # 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
-    # Send galleries as a single event? This is not an MSC (yet).
-    beeper_galleries: false
-    # Should polls be sent using MSC3381 event types?
+    # Should polls be sent using unstable MSC3381 event types?
     extev_polls: {{ matrix_mautrix_whatsapp_extev_polls | to_json }}
-    # Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this.
-    cross_room_replies: false
-    # Disable generating reply fallbacks? Some extremely bad clients still rely on them,
-    # but they're being phased out and will be completely removed in the future.
-    disable_reply_fallbacks: 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:
-        # Send an error message after this timeout, but keep waiting for the response until the deadline.
-        # This is counted from the origin_server_ts, so the warning time is consistent regardless of the source of delay.
-        # If the message is older than this when it reaches the bridge, the message won't be handled at all.
-        error_after: null
-        # Drop messages after this timeout. They may still go through if the message got sent to the servers.
-        # This is counted from the time the bridge starts handling the message.
-        deadline: 120s
-
-    # The prefix for commands. Only required in non-management rooms.
-    command_prefix: "{{ matrix_mautrix_whatsapp_command_prefix }}"
-
-    # Messages sent upon joining a management room.
-    # Markdown is supported. The defaults are listed below.
-    management_room_text:
-        # Sent when joining a room.
-        welcome: "Hello, I'm a WhatsApp bridge bot."
-        # Sent when joining a management room and the user is already logged in.
-        welcome_connected: "Use `help` for help."
-        # Sent when joining a management room and the user is not logged in.
-        welcome_unconnected: "Use `help` for help or `login` to log in."
-        # Optional extra text sent when joining a management room.
-        additional_help: ""
-
-    # End-to-bridge encryption support options.
+    # Should view-once messages be disabled entirely?
+    disable_view_once: false
+    # Should the bridge always send "active" delivery receipts (two gray ticks on WhatsApp)
+    # even if the user isn't marked as online (e.g. when presence bridging isn't enabled)?
     #
-    # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
-    encryption:
-        # Allow encryption, work in group chat rooms with e2ee enabled
-        allow: {{ matrix_mautrix_whatsapp_bridge_encryption_allow|to_json }}
-        # Default to encryption, force-enable encryption in all portals the bridge creates
-        # This will cause the bridge bot to be in private chats for the encryption to work properly.
-        # It is recommended to also set private_chat_portal_meta to true when using this.
-        default: {{ matrix_mautrix_whatsapp_bridge_encryption_default|to_json }}
-        # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
-        appservice: false
-        # Require encryption, drop any unencrypted messages.
-        require: false
-        # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
-        # You must use a client that supports requesting keys from other users to use this feature.
-        allow_key_sharing: {{ matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow|to_json }}
-        # Should users mentions be in the event wire content to enable the server to send push notifications?
-        plaintext_mentions: false
-        # Options for deleting megolm sessions from the bridge.
-        delete_keys:
-            # Beeper-specific: delete outbound sessions when hungryserv confirms
-            # that the user has uploaded the key to key backup.
-            delete_outbound_on_ack: false
-            # Don't store outbound sessions in the inbound table.
-            dont_store_outbound: false
-            # Ratchet megolm sessions forward after decrypting messages.
-            ratchet_on_decrypt: false
-            # Delete fully used keys (index >= max_messages) after decrypting messages.
-            delete_fully_used_on_decrypt: false
-            # Delete previous megolm sessions from same device when receiving a new one.
-            delete_prev_on_new_session: false
-            # Delete megolm sessions received from a device when the device is deleted.
-            delete_on_device_delete: false
-            # Periodically delete megolm sessions when 2x max_age has passed since receiving the session.
-            periodically_delete_expired: false
-            # Delete inbound megolm sessions that don't have the received_at field used for
-            # automatic ratcheting and expired session deletion. This is meant as a migration
-            # to delete old keys prior to the bridge update.
-            delete_outdated_inbound: false                
-        # What level of device verification should be required from users?
-        #
-        # Valid levels:
-        #   unverified - Send keys to all device in the room.
-        #   cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys.
-        #   cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes).
-        #   cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot.
-        #                           Note that creating user signatures from the bridge bot is not currently possible.
-        #   verified - Require manual per-device verification
-        #              (currently only possible by modifying the `trust` column in the `crypto_device` database table).
-        verification_levels:
-            # Minimum level for which the bridge should send keys to when bridging messages from WhatsApp to Matrix.
-            receive: unverified
-            # Minimum level that the bridge should accept for incoming Matrix messages.
-            send: unverified
-            # Minimum level that the bridge should require for accepting key requests.
-            share: cross-signed-tofu
-        # Options for Megolm room key rotation. These options allow you to
-        # configure the m.room.encryption event content. See:
-        # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for
-        # more information about that event.
-        rotation:
-            # Enable custom Megolm room key rotation settings. Note that these
-            # settings will only apply to rooms created after this option is
-            # set.
-            enable_custom: false
-            # The maximum number of milliseconds a session should be used
-            # before changing it. The Matrix spec recommends 604800000 (a week)
-            # as the default.
-            milliseconds: 604800000
-            # The maximum number of messages that should be sent with a given a
-            # session before changing it. The Matrix spec recommends 100 as the
-            # default.
-            messages: 100
+    # By default, the bridge acts like WhatsApp web, which only sends active delivery
+    # receipts when it's in the foreground.
+    force_active_delivery_receipts: false
 
-            # Disable rotating keys when a user's devices change?
-            # You should not enable this option unless you understand all the implications.
-            disable_device_change_key_rotation: false
+    # Settings for converting animated stickers.
+    animated_sticker:
+        # Format to which animated stickers should be converted.
+        # disable - No conversion, just unzip and send raw lottie JSON
+        # png - converts to non-animated png (fastest)
+        # gif - converts to animated gif
+        # webm - converts to webm video, requires ffmpeg executable with vp9 codec and webm container support
+        # webp - converts to animated webp, requires ffmpeg executable with webp codec/container support
+        target: webp
+        # Arguments for converter. All converters take width and height.
+        args:
+            width: 320
+            height: 320
+            fps: 25 # only for webm, webp and gif (2, 5, 10, 20 or 25 recommended)
 
-    # Settings for provisioning API
-    provisioning:
-        # Prefix for the provisioning API paths.
-        prefix: /_matrix/provision
-        # Shared secret for authentication. If set to "generate", a random secret will be generated,
-        # or if set to "disable", the provisioning API will be disabled.
-        shared_secret: generate
+    # Settings for handling history sync payloads.
+    history_sync:
+        # How many conversations should the bridge create after login?
+        # If -1, all conversations received from history sync will be bridged.
+        # Other conversations will be backfilled on demand when receiving a message.
+        max_initial_conversations: -1
+        # Should the bridge request a full sync from the phone when logging in?
+        # This bumps the size of history syncs from 3 months to 1 year.
+        request_full_sync: false
+        # Configuration parameters that are sent to the phone along with the request full sync flag.
+        # By default, (when the values are null or 0), the config isn't sent at all.
+        full_sync_config:
+            # Number of days of history to request.
+            # The limit seems to be around 3 years, but using higher values doesn't break.
+            days_limit: null
+            # This is presumably the maximum size of the transferred history sync blob, which may affect what the phone includes in the blob.
+            size_mb_limit: null
+            # This is presumably the local storage quota, which may affect what the phone includes in the history sync blob.
+            storage_quota_mb: null
+        # Settings for media requests. If the media expired, then it will not be on the WA servers.
+        # Media can always be requested by reacting with the ♻ (recycle) emoji.
+        # These settings determine if the media requests should be done automatically during or after backfill.
+        media_requests:
+            # Should the expired media be automatically requested from the server as part of the backfill process?
+            auto_request_media: true
+            # Whether to request the media immediately after the media message is backfilled ("immediate")
+            # or at a specific time of the day ("local_time").
+            request_method: immediate
+            # If request_method is "local_time", what time should the requests be sent (in minutes after midnight)?
+            request_local_time: 120
+            # Maximum number of media request responses to handle in parallel per user.
+            max_async_handle: 2
+
+
+# Config options that affect the central bridge module.
+bridge:
+    # The prefix for commands. Only required in non-management rooms.
+    command_prefix: {{ matrix_mautrix_whatsapp_command_prefix | to_json }}
+    # Should the bridge create a space for each login containing the rooms that account is in?
+    personal_filtering_spaces: {{ matrix_mautrix_whatsapp_bridge_personal_filtering_spaces | to_json }}
+    # Whether the bridge should set names and avatars explicitly for DM portals.
+    # This is only necessary when using clients that don't support MSC4171.
+    private_chat_portal_meta: true
+    # Should events be handled asynchronously within portal rooms?
+    # If true, events may end up being out of order, but slow events won't block other ones.
+    # This is not yet safe to use.
+    async_events: false
+    # Should every user have their own portals rather than sharing them?
+    # By default, users who are in the same group on the remote network will be
+    # in the same Matrix room bridged to that group. If this is set to true,
+    # every user will get their own Matrix room instead.
+    split_portals: false
+    # Should the bridge resend `m.bridge` events to all portals on startup?
+    resend_bridge_info: false
+
+    # Should leaving Matrix rooms be bridged as leaving groups on the remote network?
+    bridge_matrix_leave: false
+    # Should room tags only be synced when creating the portal? Tags mean things like favorite/pin and archive/low priority.
+    # Tags currently can't be synced back to the remote network, so a continuous sync means tagging from Matrix will be undone.
+    tag_only_on_create: true
+    # Should room mute status only be synced when creating the portal?
+    # Like tags, mutes can't currently be synced back to the remote network.
+    mute_only_on_create: true
+
+    # What should be done to portal rooms when a user logs out or is logged out?
+    # Permitted values:
+    #   nothing - Do nothing, let the user stay in the portals
+    #   kick - Remove the user from the portal rooms, but don't delete them
+    #   unbridge - Remove all ghosts in the room and disassociate it from the remote chat
+    #   delete - Remove all ghosts and users from the room (i.e. delete it)
+    cleanup_on_logout:
+        # Should cleanup on logout be enabled at all?
+        enabled: false
+        # Settings for manual logouts (explicitly initiated by the Matrix user)
+        manual:
+            # Action for private portals which will never be shared with other Matrix users.
+            private: nothing
+            # Action for portals with a relay user configured.
+            relayed: nothing
+            # Action for portals which may be shared, but don't currently have any other Matrix users.
+            shared_no_users: nothing
+            # Action for portals which have other logged-in Matrix users.
+            shared_has_users: nothing
+        # Settings for credentials being invalidated (initiated by the remote network, possibly through user action).
+        # Keys have the same meanings as in the manual section.
+        bad_credentials:
+            private: nothing
+            relayed: nothing
+            shared_no_users: nothing
+            shared_has_users: nothing
+
+    # Settings for relay mode
+    relay:
+        # Whether relay mode should be allowed. If allowed, the set-relay command can be used to turn any
+        # authenticated user into a relaybot for that chat.
+        enabled: {{ matrix_mautrix_whatsapp_bridge_relay_enabled | to_json }}
+        # Should only admins be allowed to set themselves as relay users?
+        # If true, non-admins can only set users listed in default_relays as relays in a room.
+        admin_only: {{ matrix_mautrix_whatsapp_bridge_relay_admin_only | to_json }}
+        # List of user login IDs which anyone can set as a relay, as long as the relay user is in the room.
+        default_relays: {{ matrix_mautrix_whatsapp_bridge_relay_default_relays | to_json }}
+        # The formats to use when sending messages via the relaybot.
+        # Available variables:
+        #   .Sender.UserID - The Matrix user ID of the sender.
+        #   .Sender.Displayname - The display name of the sender (if set).
+        #   .Sender.RequiresDisambiguation - Whether the sender's name may be confused with the name of another user in the room.
+        #   .Sender.DisambiguatedName - The disambiguated name of the sender. This will be the displayname if set,
+        #                               plus the user ID in parentheses if the displayname is not unique.
+        #                               If the displayname is not set, this is just the user ID.
+        #   .Message - The `formatted_body` field of the message.
+        #   .Caption - The `formatted_body` field of the message, if it's a caption. Otherwise an empty string.
+        #   .FileName - The name of the file being sent.
+        message_formats:
+            m.text: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b>: {{ .Message }}{% endraw %}"
+            m.notice: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b>: {{ .Message }}{% endraw %}"
+            m.emote: "{% raw %}* <b>{{ .Sender.DisambiguatedName }}</b> {{ .Message }}{% endraw %}"
+            m.file: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b> sent a file{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}"
+            m.image: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b> sent an image{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}"
+            m.audio: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b> sent an audio file{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}"
+            m.video: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b> sent a video{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}"
+            m.location: "{% raw %}<b>{{ .Sender.DisambiguatedName }}</b> sent a location{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}"
+        # For networks that support per-message displaynames (i.e. Slack and Discord), the template for those names.
+        # This has all the Sender variables available under message_formats (but without the .Sender prefix).
+        # Note that you need to manually remove the displayname from message_formats above.
+        displayname_format: "{% raw %}{{ .DisambiguatedName }}{% endraw %}"
 
     # Permissions for using the bridge.
     # Permitted values:
     #    relay - Talk through the relaybot (if enabled), no access otherwise
-    #     user - Access to use the bridge to chat with a WhatsApp account.
-    #    admin - User level and some additional administration tools
+    # commands - Access to use commands in the bridge, but not login.
+    #     user - Access to use the bridge with puppeting.
+    #    admin - Full access, user level with some additional administration tools.
     # Permitted keys:
     #        * - All Matrix users
     #   domain - All users on that homeserver
     #     mxid - Specific user
     permissions: {{ matrix_mautrix_whatsapp_bridge_permissions|to_json }}
 
-    # Settings for relay mode
-    relay:
-        # Whether relay mode should be allowed. If allowed, `!wa set-relay` can be used to turn any
-        # authenticated user into a relaybot for that chat.
-        enabled: {{ matrix_mautrix_whatsapp_bridge_relay_enabled | to_json }}
-        # Should only admins be allowed to set themselves as relay users?
-        admin_only: {{ matrix_mautrix_whatsapp_bridge_relay_admin_only | to_json }}
-        # The formats to use when sending messages to WhatsApp via the relaybot.
-        message_formats:
-            m.text: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: {{ '{{ .Message }}' }}"
-            m.notice: "<b>{{ '{{ .Sender.Displayname }}' }}</b>:: {{ '{{ .Message }}' }}"
-            m.emote: "* <b>{{ '{{ .Sender.Displayname }}' }}</b>: {{ '{{ .Message }}' }}"
-            m.file: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: sent a file"
-            m.image: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: sent an image"
-            m.audio: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: sent an audio file"
-            m.video: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: sent a video"
-            m.location: "<b>{{ '{{ .Sender.Displayname }}' }}</b>: sent a location"
+# Config for the bridge's database.
+database:
+    # The database type. "sqlite3-fk-wal" and "postgres" are supported.
+    type: {{ matrix_mautrix_whatsapp_appservice_database_type | to_json }}
+    # The database URI.
+    #   SQLite: A raw file path is supported, but `file:<path>?_txlock=immediate` is recommended.
+    #           https://github.com/mattn/go-sqlite3#connection-string
+    #   Postgres: Connection string. For example, postgres://user:password@host/database?sslmode=disable
+    #             To connect via Unix socket, use something like postgres:///dbname?host=/var/run/postgresql
+    uri: {{ matrix_mautrix_whatsapp_appservice_database_uri | to_json }}
+    # Maximum number of connections.
+    max_open_conns: 20
+    max_idle_conns: 2
+    # Maximum connection idle time and lifetime before they're closed. Disabled if null.
+    # Parsed with https://pkg.go.dev/time#ParseDuration
+    max_conn_idle_time: null
+    max_conn_lifetime: null
 
-# Logging config.
+# Homeserver details.
+homeserver:
+    # The address that this appservice can use to connect to the homeserver.
+    # Local addresses without HTTPS are generally recommended when the bridge is running on the same machine,
+    # but https also works if they run on different machines.
+    address: {{ matrix_mautrix_whatsapp_homeserver_address | to_json }}
+    # The domain of the homeserver (also known as server_name, used for MXIDs, etc).
+    domain: {{ matrix_mautrix_whatsapp_homeserver_domain | to_json }}
+
+    # What software is the homeserver running?
+    # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
+    software: standard
+    # The URL to push real-time bridge status to.
+    # If set, the bridge will make POST requests to this URL whenever a user's remote network connection state changes.
+    # The bridge will use the appservice as_token to authorize requests.
+    status_endpoint:
+    # Endpoint for reporting per-message status.
+    # If set, the bridge will make POST requests to this URL when processing a message from Matrix.
+    # It will make one request when receiving the message (step BRIDGE), one after decrypting if applicable
+    # (step DECRYPTED) and one after sending to the remote network (step REMOTE). Errors will also be reported.
+    # The bridge will use the appservice as_token to authorize requests.
+    message_send_checkpoint_endpoint:
+    # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246?
+    async_media: false
+
+    # Should the bridge use a websocket for connecting to the homeserver?
+    # The server side is currently not documented anywhere and is only implemented by mautrix-wsproxy,
+    # mautrix-asmux (deprecated), and hungryserv (proprietary).
+    websocket: false
+    # How often should the websocket be pinged? Pinging will be disabled if this is zero.
+    ping_interval_seconds: 0
+
+# Application service host/registration related details.
+# Changing these values requires regeneration of the registration (except when noted otherwise)
+appservice:
+    # The address that the homeserver can use to connect to this appservice.
+    # Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
+    # If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
+    # If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
+    address: {{ matrix_mautrix_whatsapp_appservice_address | to_json }}
+    # A public address that external services can use to reach this appservice.
+    # This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
+    # This value doesn't affect the registration file.
+    public_address: ""
+
+    # The hostname and port where this appservice should listen.
+    # For Docker, you generally have to change the hostname to 0.0.0.0.
+    hostname: 0.0.0.0
+    port: 8080
+
+    # The unique ID of this appservice.
+    id: whatsapp
+    # Appservice bot details.
+    bot:
+        # Username of the appservice bot.
+        username: {{ matrix_mautrix_whatsapp_appservice_bot_username | to_json }}
+        # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
+        # to leave display name/avatar as-is.
+        displayname: WhatsApp bridge bot
+        avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr
+
+    # Whether to receive ephemeral events via appservice transactions.
+    ephemeral_events: true
+    # Should incoming events be handled asynchronously?
+    # This may be necessary for large public instances with lots of messages going through.
+    # However, messages will not be guaranteed to be bridged in the same order they were sent in.
+    # This value doesn't affect the registration file.
+    async_transactions: false
+
+    # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
+    as_token: {{ matrix_mautrix_whatsapp_appservice_token | to_json }}
+    hs_token: {{ matrix_mautrix_whatsapp_homeserver_token | to_json }}
+
+    # Localpart template of MXIDs for remote users.
+    # {% raw %}{{.}}{% endraw %} is replaced with the internal ID of the user.
+    username_template: "{% raw %}whatsapp_{{.}}{% endraw %}"
+
+# Config options that affect the Matrix connector of the bridge.
+matrix:
+    # Whether the bridge should send the message status as a custom com.beeper.message_send_status event.
+    message_status_events: false
+    # Whether the bridge should send a read receipt after successfully bridging a message.
+    delivery_receipts: false
+    # Whether the bridge should send error notices via m.notice events when a message fails to bridge.
+    message_error_notices: true
+    # Whether the bridge should update the m.direct account data event when double puppeting is enabled.
+    sync_direct_chat_list: true
+    # Whether created rooms should have federation enabled. If false, created portal rooms
+    # will never be federated. Changing this option requires recreating rooms.
+    federate_rooms: {{ matrix_mautrix_whatsapp_federate_rooms|to_json }}
+    # The threshold as bytes after which the bridge should roundtrip uploads via the disk
+    # rather than keeping the whole file in memory.
+    upload_file_threshold: 5242880
+
+# Segment-compatible analytics endpoint for tracking some events, like provisioning API login and encryption errors.
+analytics:
+    # API key to send with tracking requests. Tracking is disabled if this is null.
+    token: null
+    # Address to send tracking requests to.
+    url: https://api.segment.io/v1/track
+    # Optional user ID for tracking events. If null, defaults to using Matrix user ID.
+    user_id: null
+
+# Settings for provisioning API
+provisioning:
+    # Prefix for the provisioning API paths.
+    prefix: /_matrix/provision
+    # Shared secret for authentication. If set to "generate" or null, a random secret will be generated,
+    # or if set to "disable", the provisioning API will be disabled.
+    shared_secret: {{ matrix_mautrix_whatsapp_provisioning_shared_secret | to_json }}
+    # Whether to allow provisioning API requests to be authed using Matrix access tokens.
+    # This follows the same rules as double puppeting to determine which server to contact to check the token,
+    # which means that by default, it only works for users on the same server as the bridge.
+    allow_matrix_auth: true
+    # Enable debug API at /debug with provisioning authentication.
+    debug_endpoints: false
+
+# Some networks require publicly accessible media download links (e.g. for user avatars when using Discord webhooks).
+# These settings control whether the bridge will provide such public media access.
+public_media:
+    # Should public media be enabled at all?
+    # The public_address field under the appservice section MUST be set when enabling public media.
+    enabled: false
+    # A key for signing public media URLs.
+    # If set to "generate", a random key will be generated.
+    signing_key: {{ matrix_mautrix_whatsapp_public_media_signing_key | to_json }}
+    # Number of seconds that public media URLs are valid for.
+    # If set to 0, URLs will never expire.
+    expiry: 0
+    # Length of hash to use for public media URLs. Must be between 0 and 32.
+    hash_length: 32
+
+# Settings for converting remote media to custom mxc:// URIs instead of reuploading.
+# More details can be found at https://docs.mau.fi/bridges/go/discord/direct-media.html
+direct_media:
+    # Should custom mxc:// URIs be used instead of reuploading media?
+    enabled: false
+    # The server name to use for the custom mxc:// URIs.
+    # This server name will effectively be a real Matrix server, it just won't implement anything other than media.
+    # You must either set up .well-known delegation from this domain to the bridge, or proxy the domain directly to the bridge.
+    server_name: discord-media.example.com
+    # Optionally a custom .well-known response. This defaults to `server_name:443`
+    well_known_response:
+    # Optionally specify a custom prefix for the media ID part of the MXC URI.
+    media_id_prefix:
+    # If the remote network supports media downloads over HTTP, then the bridge will use MSC3860/MSC3916
+    # media download redirects if the requester supports it. Optionally, you can force redirects
+    # and not allow proxying at all by setting this to false.
+    # This option does nothing if the remote network does not support media downloads over HTTP.
+    allow_proxy: true
+    # Matrix server signing key to make the federation tester pass, same format as synapse's .signing.key file.
+    # This key is also used to sign the mxc:// URIs to ensure only the bridge can generate them.
+    server_key: generate
+
+# Settings for backfilling messages.
+# Note that the exact way settings are applied depends on the network connector.
+# See https://docs.mau.fi/bridges/general/backfill.html for more details.
+backfill:
+    # Whether to do backfilling at all.
+    enabled: {{ matrix_mautrix_whatsapp_backfill_enabled | to_json }}
+    # Maximum number of messages to backfill in empty rooms.
+    max_initial_messages: 50
+    # Maximum number of missed messages to backfill after bridge restarts.
+    max_catchup_messages: 500
+    # If a backfilled chat is older than this number of hours,
+    # mark it as read even if it's unread on the remote network.
+    unread_hours_threshold: 720
+    # Settings for backfilling threads within other backfills.
+    threads:
+        # Maximum number of messages to backfill in a new thread.
+        max_initial_messages: 50
+    # Settings for the backwards backfill queue. This only applies when connecting to
+    # Beeper as standard Matrix servers don't support inserting messages into history.
+    queue:
+        # Should the backfill queue be enabled?
+        enabled: false
+        # Number of messages to backfill in one batch.
+        batch_size: 100
+        # Delay between batches in seconds.
+        batch_delay: 20
+        # Maximum number of batches to backfill per portal.
+        # If set to -1, all available messages will be backfilled.
+        max_batches: -1
+        # Optional network-specific overrides for max batches.
+        # Interpretation of this field depends on the network connector.
+        max_batches_override: {}
+
+# Settings for enabling double puppeting
+double_puppet:
+    # Servers to always allow double puppeting from.
+    # This is only for other servers and should NOT contain the server the bridge is on.
+    servers: {}
+    # Whether to allow client API URL discovery for other servers. When using this option,
+    # users on other servers can use double puppeting even if their server URLs aren't
+    # explicitly added to the servers map above.
+    allow_discovery: false
+    # Shared secrets for automatic double puppeting.
+    # See https://docs.mau.fi/bridges/general/double-puppeting.html for instructions.
+    secrets: {{ matrix_mautrix_whatsapp_double_puppet_secrets | to_json }}
+
+# End-to-bridge encryption support options.
+#
+# See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
+encryption:
+    # Whether to enable encryption at all. If false, the bridge will not function in encrypted rooms.
+    allow: {{ matrix_mautrix_whatsapp_bridge_encryption_allow | to_json }}
+    # Whether to force-enable encryption in all bridged rooms.
+    default: {{ matrix_mautrix_whatsapp_bridge_encryption_default | to_json }}
+    # Whether to require all messages to be encrypted and drop any unencrypted messages.
+    require: {{ matrix_mautrix_whatsapp_bridge_encryption_require | to_json }}
+    # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
+    # This option is not yet compatible with standard Matrix servers like Synapse and should not be used.
+    appservice: false
+    # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
+    # You must use a client that supports requesting keys from other users to use this feature.
+    allow_key_sharing: {{ matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow | to_json }}
+    # Pickle key for encrypting encryption keys in the bridge database.
+    # If set to generate, a random key will be generated.
+    pickle_key: {{ matrix_mautrix_whatsapp_bridge_encryption_pickle_key | to_json }}
+    # Options for deleting megolm sessions from the bridge.
+    delete_keys:
+        # Beeper-specific: delete outbound sessions when hungryserv confirms
+        # that the user has uploaded the key to key backup.
+        delete_outbound_on_ack: false
+        # Don't store outbound sessions in the inbound table.
+        dont_store_outbound: false
+        # Ratchet megolm sessions forward after decrypting messages.
+        ratchet_on_decrypt: false
+        # Delete fully used keys (index >= max_messages) after decrypting messages.
+        delete_fully_used_on_decrypt: false
+        # Delete previous megolm sessions from same device when receiving a new one.
+        delete_prev_on_new_session: false
+        # Delete megolm sessions received from a device when the device is deleted.
+        delete_on_device_delete: false
+        # Periodically delete megolm sessions when 2x max_age has passed since receiving the session.
+        periodically_delete_expired: false
+        # Delete inbound megolm sessions that don't have the received_at field used for
+        # automatic ratcheting and expired session deletion. This is meant as a migration
+        # to delete old keys prior to the bridge update.
+        delete_outdated_inbound: false
+    # What level of device verification should be required from users?
+    #
+    # Valid levels:
+    #   unverified - Send keys to all device in the room.
+    #   cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys.
+    #   cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes).
+    #   cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot.
+    #                           Note that creating user signatures from the bridge bot is not currently possible.
+    #   verified - Require manual per-device verification
+    #              (currently only possible by modifying the `trust` column in the `crypto_device` database table).
+    verification_levels:
+        # Minimum level for which the bridge should send keys to when bridging messages from the remote network to Matrix.
+        receive: unverified
+        # Minimum level that the bridge should accept for incoming Matrix messages.
+        send: unverified
+        # Minimum level that the bridge should require for accepting key requests.
+        share: cross-signed-tofu
+    # Options for Megolm room key rotation. These options allow you to configure the m.room.encryption event content.
+    # See https://spec.matrix.org/v1.10/client-server-api/#mroomencryption for more information about that event.
+    rotation:
+        # Enable custom Megolm room key rotation settings. Note that these
+        # settings will only apply to rooms created after this option is set.
+        enable_custom: false
+        # The maximum number of milliseconds a session should be used
+        # before changing it. The Matrix spec recommends 604800000 (a week)
+        # as the default.
+        milliseconds: 604800000
+        # The maximum number of messages that should be sent with a given a
+        # session before changing it. The Matrix spec recommends 100 as the
+        # default.
+        messages: 100
+        # Disable rotating keys when a user's devices change?
+        # You should not enable this option unless you understand all the implications.
+        disable_device_change_key_rotation: false
+
+# Logging config. See https://github.com/tulir/zeroconfig for details.
 logging:
-    # The directory for log files. Will be created if not found.
-    directory: ./logs
-    # Available variables: .Date for the file date and .Index for different log files on the same day.
-    # Set this to null to disable logging to file.
-    file_name_format: null
-    # Date format for file names in the Go time format: https://golang.org/pkg/time/#pkg-constants
-    file_date_format: "2006-01-02"
-    # Log file permissions.
-    file_mode: 0o600
-    # Timestamp format for log entries in the Go time format.
-    timestamp_format: "Jan _2, 2006 15:04:05"
-    # Minimum severity for log messages printed to stdout/stderr. This doesn't affect the log file.
-    # Options: debug, info, warn, error, fatal
-    print_level: {{ matrix_mautrix_whatsapp_logging_level }}
+    min_level: {{ matrix_mautrix_whatsapp_logging_level | to_json }}
+    writers:
+        - type: stdout
+          format: pretty-colored

roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml

@@ -62,7 +62,7 @@
     - "{{ matrix_mautrix_wsproxy_base_path }}"
     - "{{ matrix_mautrix_wsproxy_config_path }}"
 
-- name: Check if an old matrix state file exists
+- name: Check if an old Matrix state file exists
   ansible.builtin.stat:
     path: "{{ matrix_mautrix_wsproxy_base_path }}/mx-state.json"
   register: matrix_mautrix_wsproxy_stat_mx_state

roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml

@@ -33,15 +33,15 @@ matrix_mx_puppet_discord_appservice_address: 'http://matrix-mx-puppet-discord:{{
 
 matrix_mx_puppet_discord_bridge_mediaUrl: "{{ matrix_homeserver_url }}"  # noqa var-naming
 
-# "@user:server.com" to allow specific user
-# "@.*:yourserver.com" to allow users on a specific homeserver
+# "@user:example.com" to allow a specific user
+# "@.*:example.com" to allow users on a specific homeserver
 # "@.*" to allow anyone
 matrix_mx_puppet_discord_provisioning_whitelist:
   - "@.*:{{ matrix_domain | regex_escape }}"
 
 # Leave empty to disable blacklist
-# "@user:server.com" disallow a specific user
-# "@.*:yourserver.com" disallow users on a specific homeserver
+# "@user:example.com" to disallow a specific user
+# "@.*:example.com" to disallow users on a specific homeserver
 matrix_mx_puppet_discord_provisioning_blacklist: []
 
 matrix_mx_puppet_discord_container_network: ""

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

@@ -47,7 +47,7 @@
     - when: "matrix_mx_puppet_discord_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mx-puppet-discord/templates/config.yaml.j2

@@ -31,17 +31,17 @@ provisioning:
   # Regex of Matrix IDs allowed to use the puppet bridge
   whitelist: {{ matrix_mx_puppet_discord_provisioning_whitelist|to_json }}
     # Allow a specific user
-    #- "@user:server\\.com"
+    #- "@user:example\\.com"
     # Allow users on a specific homeserver
-    #- "@.*:yourserver\\.com"
+    #- "@.*:example\\.com"
     # Allow anyone
     #- ".*"
   # Regex of Matrix IDs forbidden from using the puppet bridge
   #blacklist:
     # Disallow a specific user
-    #- "@user:server\\.com"
+    #- "@user:example\\.com"
     # Disallow users on a specific homeserver
-    #- "@.*:yourserver\\.com"
+    #- "@.*:example\\.com"
   blacklist: {{ matrix_mx_puppet_discord_provisioning_blacklist|to_json }}
 
 relay:

roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml

@@ -29,15 +29,15 @@ matrix_mx_puppet_groupme_homeserver_address: ""
 matrix_mx_puppet_groupme_homeserver_domain: '{{ matrix_domain }}'
 matrix_mx_puppet_groupme_appservice_address: 'http://matrix-mx-puppet-groupme:{{ matrix_mx_puppet_groupme_appservice_port }}'
 
-# "@user:server.com" to allow specific user
-# "@.*:yourserver.com" to allow users on a specific homeserver
+# "@user:example.com" to allow a specific user
+# "@.*:example.com" to allow users on a specific homeserver
 # "@.*" to allow anyone
 matrix_mx_puppet_groupme_provisioning_whitelist:
   - "@.*:{{ matrix_domain | regex_escape }}"
 
 # Leave empty to disable blacklist
-# "@user:server.com" disallow a specific user
-# "@.*:yourserver.com" disallow users on a specific homeserver
+# "@user:example.com" to disallow a specific user
+# "@.*:example.com" to disallow users on a specific homeserver
 matrix_mx_puppet_groupme_provisioning_blacklist: []
 
 matrix_mx_puppet_groupme_container_network: ""

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

@@ -48,7 +48,7 @@
     - when: "matrix_mx_puppet_groupme_sqlite_database_path_local_stat_result.stat.exists | bool"
       block:
         - ansible.builtin.include_role:
-            name: galaxy/com.devture.ansible.role.postgres
+            name: galaxy/postgres
             tasks_from: migrate_db_to_postgres
           vars:
             postgres_db_migration_request:

roles/custom/matrix-bridge-mx-puppet-groupme/templates/config.yaml.j2

@@ -19,7 +19,7 @@ bridge:
   #
   # This is where GroupMe will download user profile pictures and media
   # from
-  #mediaUrl: https://external-url.org
+  #mediaUrl: https://example.org
 
 presence:
   # Bridge GroupMe online/offline status
@@ -31,17 +31,17 @@ provisioning:
   # Regex of Matrix IDs allowed to use the puppet bridge
   whitelist: {{ matrix_mx_puppet_groupme_provisioning_whitelist|to_json }}
     # Allow a specific user
-    #- "@user:server\\.com"
+    #- "@user:example\\.com"
     # Allow users on a specific homeserver
-    #- "@.*:yourserver\\.com"
+    #- "@.*:example\\.com"
     # Allow anyone
     #- ".*"
   # Regex of Matrix IDs forbidden from using the puppet bridge
   #blacklist:
     # Disallow a specific user
-    #- "@user:server\\.com"
+    #- "@user:example\\.com"
     # Disallow users on a specific homeserver
-    #- "@.*:yourserver\\.com"
+    #- "@.*:example\\.com"
   blacklist: {{ matrix_mx_puppet_groupme_provisioning_blacklist|to_json }}
 
 relay:

roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml

@@ -24,15 +24,15 @@ matrix_mx_puppet_instagram_homeserver_address: ""
 matrix_mx_puppet_instagram_homeserver_domain: '{{ matrix_domain }}'
 matrix_mx_puppet_instagram_appservice_address: 'http://matrix-mx-puppet-instagram:{{ matrix_mx_puppet_instagram_appservice_port }}'
 
-# "@user:server.com" to allow specific user
-# "@.*:yourserver.com" to allow users on a specific homeserver
+# "@user:example.com" to allow a specific user
+# "@.*:example.com" to allow users on a specific homeserver
 # "@.*" to allow anyone
 matrix_mx_puppet_instagram_provisioning_whitelist:
   - "@.*:{{ matrix_domain | regex_escape }}"
 
 # Leave empty to disable blacklist
-# "@user:server.com" disallow a specific user
-# "@.*:yourserver.com" disallow users on a specific homeserver
+# "@user:example.com" to disallow a specific user
+# "@.*:example.com" to disallow users on a specific homeserver
 matrix_mx_puppet_instagram_provisioning_blacklist: []
 
 matrix_mx_puppet_instagram_container_network: ""