Merge branch 'spantaleev:master' into default_room_version_9

.github/FUNDING.yml

@@ -1,3 +1,4 @@
+---
 # These are supported funding model platforms
 
 # https://liberapay.com/s.pantaleev/

.github/dependabot.yaml

@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily

.github/workflows/matrix.yml

@@ -0,0 +1,16 @@
+---
+name: Matrix CI
+
+on:  # yamllint disable-line rule:truthy
+  push:
+  pull_request:
+
+jobs:
+  yamllint:
+    name: 🧹 yamllint
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⤵️ Check out configuration from GitHub
+        uses: actions/checkout@v2.4.0
+      - name: 🚀 Run yamllint
+        uses: frenck/action-yamllint@v1.1.2

.yamllint

@@ -0,0 +1,8 @@
+---
+extends: default
+
+ignore: |
+  roles/matrix-synapse/vars/workers.yml
+
+rules:
+  line-length: disable

CHANGELOG.md

@@ -1,3 +1,27 @@
+# 2022-02-12
+
+## matrix_encryption_disabler support
+
+We now support installing the [matrix_encryption_disabler](https://github.com/digitalentity/matrix_encryption_disabler) Synapse module, which lets you prevent End-to-End-Encryption from being enabled by users on your homeserver. The popular opinion is that this is dangerous and shouldn't be done, but there are valid use cases for disabling encryption discussed [here](https://github.com/matrix-org/synapse/issues/4401).
+
+To enable this module (and prevent encryption from being used on your homserver), add `matrix_synapse_ext_encryption_disabler_enabled: true` to your configuration. This module provides further customization. Check its other configuration settings (and defaults) in `roles/matrix-synapse/defaults/main.yml`.
+
+
+# 2022-02-01
+
+## matrix-hookshot bridging support
+
+Thanks to [HarHarLinks](https://github.com/HarHarLinks), the playbook can now install the [matrix-hookshot](https://github.com/Half-Shot/matrix-hookshot) bridge for bridging Matrix to multiple project management services, such as GitHub, GitLab and JIRA.
+See our [Setting up matrix-hookshot](docs/configuring-playbook-bridge-hookshot.md) documentation to get started.
+
+
+# 2022-01-31
+
+## ARM support for matrix-corporal
+
+[matrix-corporal](https://github.com/devture/matrix-corporal) (as of version `2.2.3`) is now published to Docker Hub (see [devture/matrix-corporal](https://hub.docker.com/r/devture/matrix-corporal)) as a multi-arch container image with support for all these platforms: `linux/amd64`, `linux/arm64/v8` and `linux/arm/v7`. The playbook no longer resorts to self-building matrix-corporal on these ARM architectures.
+
+
 # 2022-01-07
 
 ## Dendrite support

README.md

@@ -73,6 +73,8 @@ Using this playbook, you can get the following services configured on your serve
 
 - (optional) the [matrix-appservice-webhooks](https://github.com/turt2live/matrix-appservice-webhooks) bridge for slack compatible webhooks ([ConcourseCI](https://concourse-ci.org/), [Slack](https://slack.com/) etc. pp.)
 
+- (optional) the [matrix-hookshot](https://github.com/Half-Shot/matrix-hookshot) bridge for bridging Matrix to generic webhooks and multiple project management services, such as GitHub, GitLab, Figma, and Jira in particular
+
 - (optional) the [matrix-sms-bridge](https://github.com/benkuly/matrix-sms-bridge) for bridging your Matrix server to SMS - see [docs/configuring-playbook-bridge-matrix-bridge-sms.md](docs/configuring-playbook-bridge-matrix-bridge-sms.md) for setup documentation
 
 - (optional) the [Heisenbridge](https://github.com/hifi/heisenbridge) for bridging your Matrix server to IRC bouncer-style - see [docs/configuring-playbook-bridge-heisenbridge.md](docs/configuring-playbook-bridge-heisenbridge.md) for setup documentation

docs/configuring-playbook-bot-matrix-reminder-bot.md

@@ -54,6 +54,6 @@ You can also add the bot to any existing Matrix room (`/invite @bot.matrix-remin
 
 Basic usage is like this: `!remindme in 2 minutes; This is a test`
 
-Send `!help commands` to the room to see the bot's help menu for additional commands.
+Send `!help reminders` to the room to see the bot's help menu for additional commands.
 
 You can also refer to the upstream [Usage documentation](https://github.com/anoadragon453/matrix-reminder-bot#usage).

docs/configuring-playbook-bridge-appservice-webhooks.md

@@ -2,6 +2,8 @@
 
 The playbook can install and configure [matrix-appservice-webhooks](https://github.com/turt2live/matrix-appservice-webhooks) for you.
 
+Note: This bridge is no longer maintained. While not a 1:1 replacement, the bridge's author suggests taking a look at [matrix-hookshot](https://github.com/Half-Shot/matrix-hookshot) as a replacement, which can also be installed using [this playbook](configuring-playbook-bridge-hookshot.md).
+
 This bridge provides support for Slack-compatible webhooks.
 
 Setup Instructions:

docs/configuring-playbook-bridge-hookshot.md

@@ -0,0 +1,47 @@
+# Setting up Hookshot (optional)
+
+The playbook can install and configure [matrix-hookshot](https://github.com/Half-Shot/matrix-hookshot) for you.
+
+Hookshot can bridge [Webhooks](https://en.wikipedia.org/wiki/Webhook) from software project management services such as GitHub, GitLab, JIRA, and Figma, as well as generic webhooks.
+
+See the project's [documentation](https://half-shot.github.io/matrix-hookshot/hookshot.html) to learn what it does in detail and why it might be useful to you.
+
+Note: the playbook also supports [matrix-appservice-webhooks](configuring-playbook-bridge-appservice-webhooks.md), which however is soon to be archived by its author and to be replaced by hookshot.
+
+## Setup Instructions
+
+Refer to the [official instructions](https://half-shot.github.io/matrix-hookshot/setup.html) to learn what the individual options do.
+
+1. For each of the services (GitHub, GitLab, Jira, Figma, generic webhooks) fill in the respective variables `matrix_hookshot_service_*` listed in [main.yml](/roles/matrix-bridge-hookshot/defaults/main.yml) as required.
+2. Take special note of the `matrix_hookshot_*_enabled` variables. Services that need no further configuration are enabled by default (GitLab, Generic), while you must first add the required configuration and enable the others (GitHub, Jira, Figma).
+3. If you're setting up the GitHub bridge, you'll need to generate and download a private key file after you created your GitHub app. Copy the contents of that file to the variable `matrix_hookshot_github_private_key` so the playbook can install it for you, or use one of the [other methods](#manage-github-private-key-with-matrix-aux-role) explained below. 
+4. If you've already installed Matrix services using the playbook before, you'll need to re-run it (`--tags=setup-all,start`). If not, proceed with [configuring other playbook services](configuring-playbook.md) and then with [Installing](installing.md). Get back to this guide once ready. Hookshot can be set up individually using the tag `setup-hookshot`.
+5. Refer to [Hookshot's official instructions](https://half-shot.github.io/matrix-hookshot/usage.html) to start using the bridge. Note that the different listeners are bound to certain paths (see `matrix_hookshot_matrix_nginx_proxy_configuration` in [init.yml](/roles/matrix-bridge-hookshot/tasks/init.yml)): by default webhooks root is `/hookshot/webhooks/`.
+
+Other configuration options are available via the `matrix_hookshot_configuration_extension_yaml` and `matrix_hookshot_registration_extension_yaml` variables, see the comments in [main.yml](/roles/matrix-bridge-hookshot/defaults/main.yml) for how to use them.
+
+### Manage GitHub Private Key with matrix-aux role
+
+The GitHub bridge requires you to install a private key file. This can be done in multiple ways:
+- copy the *contents* of the downloaded file and set the variable `matrix_hookshot_github_private_key` to the contents (see example in [main.yml](/roles/matrix-bridge-hookshot/defaults/main.yml)).
+- somehow copy the file to the path `{{ matrix_hookshot_base_path }}/{{ matrix_hookshot_github_private_key_file }}` (default: `/matrix/hookshot/private-key.pem`) on the server manually.
+- use the `matrix-aux` role to copy the file from an arbitrary path on your ansible client to the correct path on the server.
+
+To use `matrix-aux`, make sure the `matrix_hookshot_github_private_key` variable is empty. Then add to `matrix-aux` configuration like this:
+```yaml
+matrix_aux_file_definitions:
+  - dest: "{{ matrix_hookshot_base_path }}/{{ matrix_hookshot_github_private_key_file }}"
+    content: "{{ lookup('file', '/path/to/your-github-private-key.pem') }}"
+    mode: '0400'
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+```
+For more info see the documentation in the [matrix-aux base configuration file](/roles/matrix-aux/defaults/main.yml).
+
+### Provisioning API
+
+The provisioning API will be enabled automatically if you set `matrix_dimension_enabled: true` and provided a `matrix_hookshot_provisioning_secret`, unless you override it either way. To use hookshot with dimension, you will need to enter as "Provisioning URL": `http://matrix-hookshot:9002`, which is made up of the variables `matrix_hookshot_container_url` and `matrix_hookshot_provisioning_port`.
+
+### Metrics
+
+If metrics are enabled, they will be automatically available in the builtin Prometheus and Grafana, but you need to set up your own Dashboard for now. If additionally metrics proxying for use with external Prometheus is enabled (`matrix_nginx_proxy_proxy_synapse_metrics`), hookshot metrics will also be available (at `matrix_hookshot_metrics_endpoint`, default `/hookshot/metrics`, on the stats subdomain) and with the same password. See also [the Prometheus and Grafana docs](../configuring-playbook-prometheus-grafana.md).

docs/configuring-playbook-bridge-mx-puppet-slack.md

@@ -1,20 +1,33 @@
 # Setting up MX Puppet Slack (optional)
 
-**Note**: bridging to [Slack](https://slack.com) can also happen via the [matrix-appservice-slack](configuring-playbook-bridge-appservice-slack.md) bridge supported by the playbook.
+**Note**: bridging to [Slack](https://slack.com) can also happen via the
+[matrix-appservice-slack](configuring-playbook-bridge-appservice-slack.md)
+bridge supported by the playbook.
 
 The playbook can install and configure
 [mx-puppet-slack](https://github.com/Sorunome/mx-puppet-slack) for you.
 
 See the project page to learn what it does and why it might be useful to you.
 
-To enable the [Slack](https://slack.com/) bridge just use the following
+## Setup
-playbook configuration:
 
+To enable the [Slack](https://slack.com/) bridge:
 
-```yaml
+1. Follow the
-matrix_mx_puppet_slack_enabled: true
+   [OAuth credentials](https://github.com/Sorunome/mx-puppet-slack#option-2-oauth)
-```
+   instructions to create a new Slack app, setting the redirect URL to
-
+   `https://matrix.YOUR_DOMAIN/slack/oauth`.
+2. Update your `vars.yml` with the following:
+    ```yaml
+    matrix_mx_puppet_slack_enabled: true
+    # Client ID must be quoted so YAML does not parse it as a float.
+    matrix_mx_puppet_slack_oauth_client_id: "<SLACK_APP_CLIENT_ID>"
+    matrix_mx_puppet_slack_oauth_client_secret: "<SLACK_APP_CLIENT_SECRET>"
+    ```
+3. Run playbooks with `setup-all` and `start` tags:
+    ```
+    ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
+    ```
 
 ## Usage
 

docs/configuring-playbook-federation.md

@@ -47,3 +47,20 @@ matrix_synapse_federation_port_enabled: false
 # This removes the `8448` virtual host from the matrix-nginx-proxy reverse-proxy server.
 matrix_nginx_proxy_proxy_matrix_federation_api_enabled: false
 ```
+
+## Changing the federation port from 8448 to a different port to use a CDN that only accepts 443/80 ports
+
+Why? This change could be useful for people running small Synapse instances on small severs/VPSes to avoid being impacted by a simple DOS/DDOS when bandwidth, RAM, an CPU resources are limited and if your hosting provider does not provide a DOS/DDOS protection.
+
+The following changes in the configuration file (`inventory/host_vars/matrix.<your-domain>/vars.yml`) will allow this and make it possible to proxy the federation through a CDN such as CloudFlare or any other:
+
+```
+matrix_synapse_http_listener_resource_names: ["client","federation"]
+# Any port can be used but in this case we use 443
+matrix_federation_public_port: 443
+matrix_synapse_federation_port_enabled: false
+# Note that the following change might not be "required per se" but probably will be due to the proxying of the traffic through the CDN proxy servers (CloudFlare for instance). The security impact of doing this should be minimal as your CDN itself will encrypt the traffic no matter what on their proxy servers. You could however first try and see if federation works while setting the following to true.
+matrix_synapse_tls_federation_listener_enabled: false
+```
+
+**Use this at you own risk as all the possible side-effects of doing this are not fully known. However, it has been tested and works fine and passes all the tests on <https://federationtester.matrix.org/> without issues.**

docs/configuring-playbook-ssl-certificates.md

@@ -67,8 +67,13 @@ By default, it obtains certificates for:
 - `matrix.<your-domain>` (`matrix_server_fqn_matrix`)
 - possibly for `element.<your-domain>`, unless you have disabled the [Element client component](configuring-playbook-client-element.md) using `matrix_client_element_enabled: false`
 - possibly for `riot.<your-domain>`, if you have explicitly enabled Riot to Element redirection (for background compatibility) using `matrix_nginx_proxy_proxy_riot_compat_redirect_enabled: true`
+- possibly for `hydrogen.<your-domain>`, if you have explicitly [set up Hydrogen client](configuring-playbook-client-hydrogen.md).
+- possibly for `cinny.<your-domain>`, if you have explicitly [set up Cinny client](configuring-playbook-client-cinny.md).
 - possibly for `dimension.<your-domain>`, if you have explicitly [set up Dimension](configuring-playbook-dimension.md).
+- possibly for `goneb.<your-domain>`, if you have explicitly [set up Go-NEB bot](configuring-playbook-bot-go-neb.md).
 - possibly for `jitsi.<your-domain>`, if you have explicitly [set up Jitsi](configuring-playbook-jitsi.md).
+- possibly for `stats.<your-domain>`, if you have explicitly [set up Grafana](configuring-playbook-prometheus-grafana.md).
+- possibly for `sygnal.<your-domain>`, if you have explicitly [set up Sygnal](configuring-playbook-sygnal.md).
 - possibly for your base domain (`<your-domain>`), if you have explicitly configured [Serving the base domain](configuring-playbook-base-domain-serving.md)
 
 If you are hosting other domains on the Matrix machine, you can make the playbook obtain and renew certificates for those other domains too.

docs/configuring-playbook.md

@@ -117,6 +117,8 @@ When you're done with all the configuration you'd like to do, continue with [Ins
 
 - [Setting up Appservice Webhooks bridging](configuring-playbook-bridge-appservice-webhooks.md) (optional)
 
+- [Setting up matrix-hookshot](configuring-playbook-bridge-hookshot.md) - a bridge between Matrix and multiple project management services, such as [GitHub](https://github.com), [GitLab](https://about.gitlab.com) and [JIRA](https://www.atlassian.com/software/jira). (optional)
+
 - [Setting up MX Puppet Skype bridging](configuring-playbook-bridge-mx-puppet-skype.md) (optional)
 
 - [Setting up MX Puppet Slack bridging](configuring-playbook-bridge-mx-puppet-slack.md) (optional)

docs/faq.md

@@ -226,7 +226,7 @@ Using a separate domain name is easier to manage (although it's a little hard to
 
 We allow `matrix.DOMAIN` to be the Matrix server handling Matrix stuff for `DOMAIN` by [Server Delegation](howto-server-delegation.md). During the installation procedure, we recommend that you set up server delegation using the [.well-known](configuring-well-known.md) method.
 
-If you'd really like to install Matrix services directly on the base domain, see [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain).
+If you'd really like to install Matrix services directly on the base domain, see [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain)
 
 ### I don't control anything on the base domain and can't set up delegation to matrix.DOMAIN. What do I do?
 

examples/haproxy/docker-compose.yml

@@ -1,3 +1,4 @@
+---
 version: '3'
 services:
   nginx:

examples/vars.yml

@@ -1,3 +1,4 @@
+---
 # The bare domain name which represents your Matrix identity.
 # Matrix user ids for your server will be of the form (`@user:<matrix-domain>`).
 #

group_vars/matrix_servers

@@ -662,6 +662,45 @@ matrix_heisenbridge_systemd_wanted_services_list: |
 #
 ######################################################################
 
+######################################################################
+#
+# matrix-bridge-hookshot
+#
+######################################################################
+
+# We don't enable bridges by default.
+matrix_hookshot_enabled: false
+
+matrix_hookshot_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'hookshot.as.tok') | to_uuid }}"
+
+matrix_hookshot_homeserver_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'hookshot.hs.tok') | to_uuid }}"
+
+matrix_hookshot_systemd_wanted_services_list: |
+  {{
+    (['matrix-' + matrix_homeserver_implementation + '.service'])
+    +
+    (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
+  }}
+
+matrix_hookshot_container_http_host_bind_ports_defaultmapping:
+  - "127.0.0.1:{{ matrix_hookshot_appservice_port }}:{{ matrix_hookshot_appservice_port }}"
+  - "127.0.0.1:{{ matrix_hookshot_metrics_port }}:{{ matrix_hookshot_metrics_port }}"
+  - "127.0.0.1:{{ matrix_hookshot_webhook_port }}:{{ matrix_hookshot_webhook_port }}"
+  - "127.0.0.1:{{ matrix_hookshot_provisioning_port }}:{{ matrix_hookshot_provisioning_port }}"
+
+matrix_hookshot_container_http_host_bind_ports: "{{ [] if matrix_nginx_proxy_enabled else matrix_hookshot_container_http_host_bind_ports_defaultmapping }}"
+
+matrix_hookshot_provisioning_enabled: "{{ matrix_hookshot_provisioning_secret and matrix_dimension_enabled }}"
+
+matrix_hookshot_proxy_metrics: "{{ matrix_nginx_proxy_proxy_synapse_metrics }}"
+matrix_hookshot_proxy_metrics_basic_auth_enabled: "{{ matrix_nginx_proxy_proxy_synapse_metrics_basic_auth_enabled }}"
+
+######################################################################
+#
+# /matrix-bridge-hookshot
+#
+######################################################################
+
 ######################################################################
 #
 # matrix-bridge-mx-puppet-skype
@@ -1059,7 +1098,7 @@ matrix_bot_mjolnir_systemd_required_services_list: |
 
 matrix_corporal_enabled: false
 
-matrix_corporal_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
+matrix_corporal_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
 
 # Normally, matrix-nginx-proxy is enabled and nginx can reach matrix-corporal over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
@@ -1089,8 +1128,6 @@ matrix_corporal_matrix_registration_shared_secret: "{{ matrix_synapse_registrati
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-coturn
@@ -1125,8 +1162,6 @@ matrix_coturn_container_additional_volumes: |
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-dimension
@@ -1204,8 +1239,6 @@ matrix_dynamic_dns_enabled: false
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-email2matrix
@@ -1214,7 +1247,7 @@ matrix_dynamic_dns_enabled: false
 
 matrix_email2matrix_enabled: false
 
-matrix_email2matrix_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
+matrix_email2matrix_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
 
 ######################################################################
 #
@@ -1222,8 +1255,6 @@ matrix_email2matrix_container_image_self_build: "{{ matrix_architecture != 'amd6
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-jitsi
@@ -1268,8 +1299,6 @@ matrix_jitsi_etherpad_base: "{{ matrix_etherpad_base_url if matrix_etherpad_enab
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-mailer
@@ -1281,7 +1310,7 @@ matrix_jitsi_etherpad_base: "{{ matrix_etherpad_base_url if matrix_etherpad_enab
 # Other services (like ma1sd), also use the mailer.
 matrix_mailer_enabled: true
 
-matrix_mailer_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
+matrix_mailer_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
 
 ######################################################################
 #
@@ -1289,8 +1318,6 @@ matrix_mailer_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-ma1sd
@@ -1354,8 +1381,6 @@ matrix_ma1sd_database_password: "{{ '%s' | format(matrix_homeserver_generic_secr
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-nginx-proxy
@@ -1482,6 +1507,10 @@ matrix_nginx_proxy_systemd_wanted_services_list: |
     (['matrix-jitsi.service'] if matrix_jitsi_enabled else [])
     +
     (['matrix-bot-go-neb.service'] if matrix_bot_go_neb_enabled else [])
+    +
+    (['matrix-etherpad.service'] if matrix_etherpad_enabled and matrix_dimension_enabled else [])
+    +
+    (['matrix-hookshot.service'] if matrix_hookshot_enabled else [])
   }}
 
 matrix_ssl_domains_to_obtain_certificates_for: |
@@ -1527,8 +1556,6 @@ matrix_ssl_pre_obtaining_required_service_name: "{{ 'matrix-dynamic-dns' if matr
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-postgres
@@ -1777,8 +1804,6 @@ matrix_postgres_import_databases_to_ignore: |
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-sygnal
@@ -1799,8 +1824,6 @@ matrix_sygnal_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enable
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-redis
@@ -1815,8 +1838,6 @@ matrix_redis_enabled: "{{ matrix_synapse_workers_enabled }}"
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-client-element
@@ -1864,8 +1885,6 @@ matrix_client_element_jitsi_preferredDomain: "{{ matrix_server_fqn_jitsi if matr
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-client-hydrogen
@@ -1889,8 +1908,6 @@ matrix_client_hydrogen_self_check_validate_certificates: "{{ false if matrix_ssl
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-client-cinny
@@ -1916,8 +1933,6 @@ matrix_client_cinny_self_check_validate_certificates: "{{ false if matrix_ssl_re
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-synapse
@@ -2028,8 +2043,6 @@ matrix_synapse_redis_password: "{{ matrix_redis_connection_password if matrix_re
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-synapse-admin
@@ -2051,8 +2064,6 @@ matrix_synapse_admin_container_image_self_build: "{{ matrix_architecture != 'amd
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-prometheus-node-exporter
@@ -2067,8 +2078,6 @@ matrix_prometheus_node_exporter_enabled: false
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-prometheus
@@ -2093,6 +2102,8 @@ matrix_prometheus_scraper_node_targets: "{{ ['matrix-prometheus-node-exporter:91
 matrix_prometheus_scraper_postgres_enabled: "{{ matrix_prometheus_postgres_exporter_enabled }}"
 matrix_prometheus_scraper_postgres_targets: "{{ ['matrix-prometheus-postgres-exporter:'+ matrix_prometheus_postgres_exporter_port|string] if matrix_prometheus_scraper_postgres_enabled else [] }}"
 
+matrix_prometheus_scraper_hookshot_enabled: "{{ matrix_hookshot_metrics_enabled }}"
+matrix_prometheus_scraper_hookshot_targets: "{{ [matrix_hookshot_container_url|string +':'+ matrix_hookshot_metrics_port|string] if matrix_hookshot_metrics_enabled else [] }}"
 
 ######################################################################
 #
@@ -2100,7 +2111,6 @@ matrix_prometheus_scraper_postgres_targets: "{{ ['matrix-prometheus-postgres-exp
 #
 ######################################################################
 
-
 ######################################################################
 #
 # matrix-prometheus-postgres-exporter
@@ -2156,8 +2166,6 @@ matrix_grafana_systemd_wanted_services_list: |
 #
 ######################################################################
 
-
-
 ######################################################################
 #
 # matrix-registration

roles/matrix-aux/tasks/main.yml

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/setup.yml"
   when: run_stop|bool
   tags:

roles/matrix-awx/defaults/main.yml

@@ -1,3 +1,5 @@
+---
+
 matrix_awx_enabled: true
 
 # Defaults for 'Customise Website + Access Export' template

roles/matrix-awx/tasks/backup_server.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Record Backup Server variables locally on AWX
   delegate_to: 127.0.0.1
@@ -38,18 +39,18 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/backup_server.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   tags: use-survey
 
 - name: Include vars in matrix_vars.yml
   include_vars:
     file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
-  no_log: True
+  no_log: true
 
 - name: Copy new 'matrix_vars.yml' to target machine
   copy:

roles/matrix-awx/tasks/bridge_discord_appservice.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Record Bridge Discord AppService variables locally on AWX
   delegate_to: 127.0.0.1
@@ -54,4 +55,4 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/cache_matrix_variables.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Collect current datetime
   set_fact:

roles/matrix-awx/tasks/create_session_token.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Create a AWX session token for executing modules
   awx.awx.tower_token:
@@ -7,4 +8,4 @@
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_master_token }}"
   register: awx_session_token
-  no_log: True
+  no_log: true

roles/matrix-awx/tasks/create_user.yml

@@ -1,3 +1,4 @@
+---
 #
 # Create user and define if they are admin
 #

roles/matrix-awx/tasks/customise_website_access_export.yml

@@ -48,7 +48,7 @@
 - name: Reload vars in matrix_vars.yml
   include_vars:
     file: '{{ awx_cached_matrix_vars }}'
-  no_log: True
+  no_log: true
 
 - name: Save new 'Customise Website + Access Export' survey.json to the AWX tower, template
   delegate_to: 127.0.0.1
@@ -92,12 +92,12 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_website_access_export.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: awx_customise_base_domain_website is defined
 
 - name: Recreate 'Access Export' job template
@@ -114,12 +114,12 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/access_export.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: awx_customise_base_domain_website is undefined
 
 - name: If user doesn't define a awx_sftp_password, create a disabled 'sftp' account
@@ -153,7 +153,7 @@
   user:
     name: sftp
     groups: sftp
-    append: yes
+    append: true
   when: awx_customise_base_domain_website is defined
 
 - name: Create the ro /chroot directory with sticky bit if it doesn't exist. (/chroot/website has matrix:matrix permissions and is mounted to nginx container)

roles/matrix-awx/tasks/export_server.yml

@@ -23,7 +23,7 @@
     command: rm /chroot/export/matrix*
     count: 1
     units: days
-    unique: yes
+    unique: true
 
 - name: Delete the AWX session token for executing modules
   awx.awx.tower_token:

roles/matrix-awx/tasks/load_hosting_and_org_variables.yml

@@ -3,14 +3,14 @@
 - name: Include vars in organisation.yml
   include_vars:
     file: '/var/lib/awx/projects/clients/{{ member_id }}/organisation.yml'
-  no_log: True
+  no_log: true
 
 - name: Include vars in hosting_vars.yml
   include_vars:
     file: '/var/lib/awx/projects/hosting/hosting_vars.yml'
-  no_log: True
+  no_log: true
 
 - name: Include AWX master token from awx_tokens.yml
   include_vars:
     file: /var/lib/awx/projects/hosting/awx_tokens.yml
-  no_log: True
+  no_log: true

roles/matrix-awx/tasks/load_matrix_variables.yml

@@ -3,7 +3,7 @@
 - name: Include new vars in matrix_vars.yml
   include_vars:
     file: '{{ awx_cached_matrix_vars }}'
-  no_log: True
+  no_log: true
 
 - name: If include_vars succeeds overwrite the old matrix_vars.yml
   delegate_to: 127.0.0.1

roles/matrix-awx/tasks/main.yml

@@ -1,4 +1,4 @@
-
+---
 # Load initial hosting and organisation variables from AWX volume
 - include_tasks:
     file: "load_hosting_and_org_variables.yml"

roles/matrix-awx/tasks/purge_database_main.yml

@@ -9,7 +9,7 @@
 - name: Include vars in matrix_vars.yml
   include_vars:
     file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
-  no_log: True
+  no_log: true
 
 - name: Ensure curl and jq intalled on target machine
   apt:
@@ -22,7 +22,7 @@
   shell: du -sh /matrix/postgres/data
   register: awx_db_size_before_stat
   when: (awx_purge_mode.find("Perform final shrink") != -1)
-  no_log: True
+  no_log: true
 
 - name: Collect the internal IP of the matrix-synapse container
   shell: "/usr/bin/docker inspect --format '{''{range.NetworkSettings.Networks}''}{''{.IPAddress}''}{''{end}''}' matrix-synapse"
@@ -34,7 +34,7 @@
     curl -X POST -d '{"type":"m.login.password", "user":"admin-janitor", "password":"{{ awx_janitor_user_password }}"}' "{{ awx_synapse_container_ip.stdout }}:{{ matrix_synapse_container_client_api_port }}/_matrix/client/r0/login" | jq '.access_token'
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1)
   register: awx_janitors_token
-  no_log: True
+  no_log: true
 
 - name: Copy build_room_list.py script to target machine
   copy:
@@ -55,7 +55,7 @@
   fetch:
     src: /tmp/room_list_complete.json
     dest: "/tmp/{{ subscription_id }}_room_list_complete.json"
-    flat: yes
+    flat: true
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1)
 
 - name: Remove complete room list from target machine
@@ -80,7 +80,7 @@
 - name: Setting host fact awx_room_list_no_local_users
   set_fact:
     awx_room_list_no_local_users: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_no_local_users.txt') }}"
-  no_log: True
+  no_log: true
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1)
 
 - name: Purge all rooms with no local users
@@ -113,7 +113,7 @@
   set_fact:
     awx_room_list_joined_members: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_joined_members.txt') }}"
   when: awx_purge_mode.find("Number of users [slower]") != -1
-  no_log: True
+  no_log: true
 
 - name: Purge all rooms with more then N users
   include_tasks: purge_database_users.yml
@@ -138,7 +138,7 @@
   set_fact:
     awx_room_list_state_events: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_state_events.txt') }}"
   when: awx_purge_mode.find("Number of events [slower]") != -1
-  no_log: True
+  no_log: true
 
 - name: Purge all rooms with more then N events
   include_tasks: purge_database_events.yml
@@ -161,17 +161,17 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1) or (awx_purge_mode.find("Skip purging rooms [faster]") != -1)
 
 - name: Execute rust-synapse-compress-state job template
   delegate_to: 127.0.0.1
   awx.awx.tower_job_launch:
     job_template: "{{ matrix_domain }} - 0 - Deploy/Update a Server"
-    wait: yes
+    wait: true
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1) or (awx_purge_mode.find("Skip purging rooms [faster]") != -1)
 
 - name: Revert 'Deploy/Update a Server' job template
@@ -190,14 +190,14 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1) or (awx_purge_mode.find("Skip purging rooms [faster]") != -1)
 
 - name: Ensure matrix-synapse is stopped
   service:
     name: matrix-synapse
     state: stopped
-    daemon_reload: yes
+    daemon_reload: true
   when: (awx_purge_mode.find("Perform final shrink") != -1)
 
 - name: Re-index Synapse database
@@ -208,7 +208,7 @@
   service:
     name: matrix-synapse
     state: started
-    daemon_reload: yes
+    daemon_reload: true
   when: (awx_purge_mode.find("Perform final shrink") != -1)
 
 - name: Adjust 'Deploy/Update a Server' job template
@@ -227,17 +227,17 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("Perform final shrink") != -1)
 
 - name: Execute run-postgres-vacuum job template
   delegate_to: 127.0.0.1
   awx.awx.tower_job_launch:
     job_template: "{{ matrix_domain }} - 0 - Deploy/Update a Server"
-    wait: yes
+    wait: true
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("Perform final shrink") != -1)
 
 - name: Revert 'Deploy/Update a Server' job template
@@ -256,7 +256,7 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
   when: (awx_purge_mode.find("Perform final shrink") != -1)
 
 - name: Cleanup room_list files
@@ -264,13 +264,13 @@
   shell: |
     rm /tmp/{{ subscription_id }}_room_list*
   when: (awx_purge_mode.find("No local users [recommended]") != -1) or (awx_purge_mode.find("Number of users [slower]") != -1) or (awx_purge_mode.find("Number of events [slower]") != -1)
-  ignore_errors: yes
+  ignore_errors: true
 
 - name: Collect after shrink size of Synapse database
   shell: du -sh /matrix/postgres/data
   register: awx_db_size_after_stat
   when: (awx_purge_mode.find("Perform final shrink") != -1)
-  no_log: True
+  no_log: true
 
 - name: Print total number of rooms processed
   debug:

roles/matrix-awx/tasks/purge_media_main.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Ensure dateutils is installed in AWX
   delegate_to: 127.0.0.1
@@ -8,7 +9,7 @@
 - name: Include vars in matrix_vars.yml
   include_vars:
     file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
-  no_log: True
+  no_log: true
 
 - name: Ensure curl and jq intalled on target machine
   apt:
@@ -25,7 +26,7 @@
   shell: |
     curl -XPOST -d '{"type":"m.login.password", "user":"admin-janitor", "password":"{{ awx_janitor_user_password }}"}' "{{ awx_synapse_container_ip.stdout }}:{{ matrix_synapse_container_client_api_port }}/_matrix/client/r0/login" | jq '.access_token'
   register: awx_janitors_token
-  no_log: True
+  no_log: true
 
 - name: Generate list of dates to purge to
   delegate_to: 127.0.0.1
@@ -37,16 +38,16 @@
   register: awx_local_media_size_before
   when: awx_purge_media_type == "Local Media"
   async: 600
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Calculate initial size of remote media repository
   shell: du -sh /matrix/synapse/storage/media-store/remote*
   register: awx_remote_media_size_before
   when: awx_purge_media_type == "Remote Media"
   async: 600
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Purge local media with loop
   include_tasks: purge_media_local.yml
@@ -62,15 +63,15 @@
   shell: du -sh /matrix/synapse/storage/media-store/local*
   register: awx_local_media_size_after
   when: awx_purge_media_type == "Local Media"
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Calculate final size of remote media repository
   shell: du -sh /matrix/synapse/storage/media-store/remote*
   register: awx_remote_media_size_after
   when: awx_purge_media_type == "Remote Media"
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Print size of local media repository before purge
   debug:

roles/matrix-awx/tasks/rotate_ssh.yml

@@ -4,7 +4,7 @@
   authorized_key:
     user: root
     state: present
-    exclusive: yes
+    exclusive: true
     key: "{{ lookup('file', '/var/lib/awx/projects/hosting/client_public.key') }}"
 
 - name: Delete the AWX session token for executing modules

roles/matrix-awx/tasks/self_check.yml

@@ -25,47 +25,47 @@
   shell: |
     curl -s localhost:9000 | grep "^synapse_admin_mau_current "
   register: awx_mau_stat
-  no_log: True
+  no_log: true
 
 - name: Calculate CPU usage statistics
   shell: iostat -c
   register: awx_cpu_usage_stat
-  no_log: True
+  no_log: true
 
 - name: Calculate RAM usage statistics
   shell: free -mh
   register: awx_ram_usage_stat
-  no_log: True
+  no_log: true
 
 - name: Calculate free disk space
   shell: df -h
   register: awx_disk_space_stat
-  no_log: True
+  no_log: true
 
 - name: Calculate size of Synapse database
   shell: du -sh /matrix/postgres/data
   register: awx_db_size_stat
-  no_log: True
+  no_log: true
 
 - name: Calculate size of local media repository
   shell: du -sh /matrix/synapse/storage/media-store/local*
   register: awx_local_media_size_stat
   async: 600
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Calculate size of remote media repository
   shell: du -sh /matrix/synapse/storage/media-store/remote*
   register: awx_remote_media_size_stat
   async: 600
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Calculate docker container statistics
   shell: docker stats --all --no-stream
   register: awx_docker_stats
-  ignore_errors: yes
+  ignore_errors: true
-  no_log: True
+  no_log: true
 
 - name: Print size of remote media repository
   debug:

roles/matrix-awx/tasks/set_variables_corporal.yml

@@ -235,9 +235,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_corporal.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_dimension.yml

@@ -3,7 +3,7 @@
 - name: Include vars in matrix_vars.yml
   include_vars:
     file: '{{ awx_cached_matrix_vars }}'
-  no_log: True
+  no_log: true
 
 - name: Install jq and curl on remote machine
   apt:
@@ -14,7 +14,7 @@
 
 - name: Collect access token of @admin-dimension user
   shell: |
-    curl -X POST --header 'Content-Type: application/json' -d '{ "identifier": { "type": "m.id.user","user": "admin-dimension" }, "password": "{{ awx_dimension_user_password }}", "type": "m.login.password"}' 'https://matrix.{{ matrix_domain }}/_matrix/client/r0/login' | jq -c '. | {access_token}' | sed 's/.*\":\"//' | sed 's/\"}//'
+    curl -X POST --header 'Content-Type: application/json' -d '{"identifier": {"type": "m.id.user","user": "admin-dimension"}, "password": "{{ awx_dimension_user_password }}", "type": "m.login.password"}' 'https://matrix.{{ matrix_domain }}/_matrix/client/r0/login' | jq -c '. | {access_token}' | sed 's/.*\":\"//' | sed 's/\"}//'
   register: awx_dimension_user_access_token
 
 - name: Record Synapse variables locally on AWX
@@ -97,9 +97,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_dimension.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_element.yml

@@ -172,9 +172,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_element.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_element_subdomain.yml

@@ -40,4 +40,4 @@
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_jitsi.yml

@@ -37,9 +37,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_jitsi.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_ma1sd.yml

@@ -66,7 +66,7 @@
   with_dict:
     'awx_matrix_ma1sd_auth_store': '{{ awx_matrix_ma1sd_auth_store }}'
     'awx_matrix_ma1sd_configuration_extension_yaml': '{{ awx_matrix_ma1sd_configuration_extension_yaml.splitlines() | to_json }}'
-  no_log: True
+  no_log: true
 
 - name: Save new 'Configure ma1sd' survey.json to the AWX tower, template
   delegate_to: 127.0.0.1
@@ -94,10 +94,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_ma1sd.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true
-

roles/matrix-awx/tasks/set_variables_mailer.yml

@@ -36,9 +36,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_email_relay.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_synapse.yml

@@ -1,3 +1,4 @@
+---
 
 - name: Limit max upload size to 200MB part 1
   set_fact:
@@ -214,9 +215,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_synapse.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/set_variables_synapse_admin.yml

@@ -36,9 +36,9 @@
     credential: "{{ member_id }} - AWX SSH Key"
     survey_enabled: true
     survey_spec: "{{ lookup('file', '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/configure_synapse_admin.json') }}"
-    become_enabled: yes
+    become_enabled: true
     state: present
     verbosity: 1
     tower_host: "https://{{ awx_host }}"
     tower_oauthtoken: "{{ awx_session_token.ansible_facts.tower_token.token }}"
-    validate_certs: yes
+    validate_certs: true

roles/matrix-awx/tasks/update_variables.yml

@@ -12,7 +12,7 @@
   command: |
       openssl rand -hex 16
   register: generic_secret
-  no_log: True
+  no_log: true
   when: ( matrix_homeserver_generic_secret_key is undefined ) or ( matrix_homeserver_generic_secret_key | length == 0 )
 
 - name: Add new matrix_homeserver_generic_secret_key variable

roles/matrix-base/defaults/main.yml

@@ -1,3 +1,4 @@
+---
 # The bare domain name which represents your Matrix identity.
 # Matrix user ids for your server will be of the form (`@user:<matrix-domain>`).
 #
@@ -98,8 +99,8 @@ matrix_host_command_openssl: "/usr/bin/env openssl"
 matrix_host_command_systemctl: "/usr/bin/env systemctl"
 matrix_host_command_sh: "/usr/bin/env sh"
 
-matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18')  else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}"
+matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7) or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int > 18)  else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}"
-matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
+matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7) or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int > 18) or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
 
 matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 

roles/matrix-base/files/yum.repos.d/docker-ce-fedora.repo

@@ -0,0 +1,62 @@
+[docker-ce-stable]
+name=Docker CE Stable - $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-stable-debuginfo]
+name=Docker CE Stable - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/debug-$basearch/stable
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-stable-source]
+name=Docker CE Stable - Sources
+baseurl=https://download.docker.com/linux/fedora/$releasever/source/stable
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-test]
+name=Docker CE Test - $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-test-debuginfo]
+name=Docker CE Test - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/debug-$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-test-source]
+name=Docker CE Test - Sources
+baseurl=https://download.docker.com/linux/fedora/$releasever/source/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-nightly]
+name=Docker CE Nightly - $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/nightly
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-nightly-debuginfo]
+name=Docker CE Nightly - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/debug-$basearch/nightly
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
+
+[docker-ce-nightly-source]
+name=Docker CE Nightly - Sources
+baseurl=https://download.docker.com/linux/fedora/$releasever/source/nightly
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg

roles/matrix-base/tasks/main.yml

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/sanity_check.yml"
   tags:
     - always

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

@@ -1,10 +1,13 @@
 ---
 
-- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos.yml"
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat.yml"
-  when: ansible_distribution == 'CentOS' and ansible_distribution_major_version < '8'
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 8
 
-- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos8.yml"
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
-  when: ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7'
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7 and ansible_distribution_major_version|int < 30
+
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_fedora.yml"
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 30
 
 - block:
   # ansible_lsb is only available if lsb-release is installed.
@@ -13,7 +16,7 @@
       name:
         - lsb-release
       state: present
-      update_cache: yes
+      update_cache: true
     register: lsb_release_installation_result
 
   - name: Reread ansible_lsb facts if lsb-release got installed
@@ -34,10 +37,10 @@
   service:
     name: docker
     state: started
-    enabled: yes
+    enabled: true
 
 - name: "Ensure {{ matrix_ntpd_service }} is started and autoruns"
   service:
     name: "{{ matrix_ntpd_service }}"
     state: started
-    enabled: yes
+    enabled: true

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

@@ -6,7 +6,7 @@
       - python-docker
       - python-dnspython
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker is installed
   pacman:

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

@@ -7,7 +7,7 @@
       - ca-certificates
       - gnupg
     state: present
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker's APT key is trusted
   apt_key:
@@ -22,7 +22,7 @@
   apt_repository:
     repo: "deb [arch={{ matrix_debian_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
     state: present
-    update_cache: yes
+    update_cache: true
   when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 
 - name: Ensure APT packages are installed
@@ -30,7 +30,7 @@
     name:
       - "{{ matrix_ntpd_package }}"
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker is installed
   apt:

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

@@ -0,0 +1,39 @@
+---
+
+- name: Ensure Docker repository is enabled
+  template:
+    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
+    dest: "/etc/yum.repos.d/docker-ce.repo"
+    owner: "root"
+    group: "root"
+    mode: 0644
+  with_items:
+    - docker-ce-fedora.repo
+  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
+
+- name: Ensure Docker's RPM key is trusted
+  rpm_key:
+    state: present
+    key: https://download.docker.com/linux/fedora/gpg
+  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
+
+- name: Ensure yum packages are installed
+  yum:
+    name:
+      - "{{ matrix_ntpd_package }}"
+    state: latest
+    update_cache: true
+
+- name: Ensure Docker is installed
+  yum:
+    name:
+      - "{{ matrix_docker_package_name }}"
+      - python3-pip
+    state: latest
+  when: matrix_docker_installation_enabled|bool
+
+- name: Ensure Docker-Py is installed
+  pip:
+    name: docker-py
+    state: latest
+  when: matrix_docker_installation_enabled|bool

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

@@ -7,7 +7,7 @@
       - ca-certificates
       - gnupg
     state: present
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker's APT key is trusted
   apt_key:
@@ -22,7 +22,7 @@
   apt_repository:
     repo: "deb [arch={{ matrix_debian_arch }}] https://download.docker.com/linux/raspbian {{ ansible_distribution_release }} stable"
     state: present
-    update_cache: yes
+    update_cache: true
   when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 
 - name: Ensure APT packages are installed
@@ -30,7 +30,7 @@
     name:
       - "{{ matrix_ntpd_package }}"
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker is installed
   apt:

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

@@ -2,13 +2,11 @@
 
 - name: Ensure Docker repository is enabled
   template:
-    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
+    src: "{{ role_path }}/files/yum.repos.d/docker-ce-centos.repo"
-    dest: "/etc/yum.repos.d/{{ item }}"
+    dest: "/etc/yum.repos.d/docker-ce.repo"
     owner: "root"
     group: "root"
     mode: 0644
-  with_items:
-    - docker-ce.repo
   when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 
 - name: Ensure Docker's RPM key is trusted
@@ -22,7 +20,7 @@
     name:
       - "{{ matrix_ntpd_package }}"
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker is installed
   yum:

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

@@ -2,13 +2,11 @@
 
 - name: Ensure Docker repository is enabled
   template:
-    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
+    src: "{{ role_path }}/files/yum.repos.d/docker-ce-centos.repo"
-    dest: "/etc/yum.repos.d/{{ item }}"
+    dest: "/etc/yum.repos.d/docker-ce.repo"
     owner: "root"
     group: "root"
     mode: 0644
-  with_items:
-    - docker-ce.repo
   when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 
 - name: Ensure Docker's RPM key is trusted
@@ -22,14 +20,14 @@
     name:
       - epel-release
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure yum packages are installed
   yum:
     name:
       - "{{ matrix_ntpd_package }}"
     state: latest
-    update_cache: yes
+    update_cache: true
 
 - name: Ensure Docker is installed
   yum:

roles/matrix-base/tasks/setup_matrix_user.yml

@@ -18,8 +18,8 @@
     state: present
     group: "{{ matrix_user_groupname }}"
     home: "{{ matrix_base_data_path }}"
-    create_home: no
+    create_home: false
-    system: yes
+    system: true
   register: matrix_user
 
 - name: Set Matrix Group UID Variable

roles/matrix-base/tasks/setup_well_known.yml

@@ -1,3 +1,4 @@
+---
 # We need others to be able to read these directories too,
 # so that matrix-nginx-proxy's nginx user can access the files.
 #

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

@@ -1,11 +1,11 @@
-
+---
-# This is for both CentOS 7 and 8
+# This is for both RedHat 7 and 8
-- name: Ensure fuse installed (CentOS)
+- name: Ensure fuse installed (RedHat)
   yum:
     name:
       - fuse
     state: latest
-  when: ansible_distribution == 'CentOS'
+  when: ansible_os_family == 'RedHat'
 
 # This is for both Debian and Raspbian
 - name: Ensure fuse installed (Debian/Raspbian)

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

@@ -0,0 +1,23 @@
+---
+# This is for both RedHat 7 and 8
+- name: Ensure openssl installed (RedHat)
+  yum:
+    name:
+      - openssl
+    state: latest
+  when: ansible_os_family == 'RedHat'
+
+# This is for both Debian and Raspbian
+- name: Ensure openssl installed (Debian/Raspbian)
+  apt:
+    name:
+      - openssl
+    state: latest
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure openssl installed (Archlinux)
+  pacman:
+    name:
+      - openssl
+    state: latest
+  when: ansible_distribution == 'Archlinux'

roles/matrix-base/vars/main.yml

@@ -1,3 +1,4 @@
+---
 # This will contain a list of enabled services that the playbook is managing.
 # Each component is expected to append its service name to this list.
 matrix_systemd_services_list: []

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

@@ -1,3 +1,4 @@
+---
 # Go-NEB is a Matrix bot written in Go. It is the successor to Matrix-NEB, the original Matrix bot written in Python.
 # See: https://github.com/matrix-org/go-neb
 
@@ -203,8 +204,8 @@ matrix_bot_go_neb_services: []
 #      # Each room will get the notification with the alert rendered with the given template
 #      rooms:
 #        "!someroomid:domain.tld":
-#          text_template: "{% raw %}{{range .Alerts -}} [{{ .Status }}] {{index .Labels \"alertname\" }}: {{index .Annotations \"description\"}} {{ end -}}{% endraw %}"
+#          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 %}"
+#          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`
 
 # Default configuration template which covers the generic use case.
@@ -228,4 +229,3 @@ matrix_bot_go_neb_configuration_extension: "{{ matrix_bot_go_neb_configuration_e
 # Holds the final configuration (a combination of the default and its extension).
 # You most likely don't need to touch this variable. Instead, see `matrix_bot_go_neb_configuration_yaml`.
 matrix_bot_go_neb_configuration: "{{ matrix_bot_go_neb_configuration_yaml|from_yaml|combine(matrix_bot_go_neb_configuration_extension, recursive=True) }}"
-

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

@@ -1,3 +1,5 @@
+---
+
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-go-neb.service'] }}"
   when: matrix_bot_go_neb_enabled|bool

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -11,9 +11,9 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_bot_go_neb_config_path }}", when: true }
+    - {path: "{{ matrix_bot_go_neb_config_path }}", when: true}
-    - { path: "{{ matrix_bot_go_neb_data_path }}", when: true }
+    - {path: "{{ matrix_bot_go_neb_data_path }}", when: true}
-    - { path: "{{ matrix_bot_go_neb_data_store_path }}", when: true }
+    - {path: "{{ matrix_bot_go_neb_data_store_path }}", when: true}
   when: "item.when|bool"
 
 - name: Ensure go-neb image is pulled
@@ -40,7 +40,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-go-neb.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_go_neb_systemd_service_result.changed|bool"
 
 - name: Ensure matrix-bot-go-neb.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-bot-go-neb
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   register: stopping_result
   when: "matrix_bot_go_neb_service_stat.stat.exists|bool"
 
@@ -22,7 +22,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-go-neb.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_go_neb_service_stat.stat.exists|bool"
 
 - name: Ensure Matrix go-neb paths don't exist

roles/matrix-bot-go-neb/templates/systemd/matrix-bot-go-neb.service.j2

@@ -39,8 +39,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-go-neb \
 			{{ matrix_bot_go_neb_docker_image }} \
 			-c "go-neb /config/config.yaml"
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-go-neb 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-go-neb 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-go-neb 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-go-neb 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-bot-go-neb

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

@@ -1,3 +1,4 @@
+---
 # honoroit is a helpdesk bot
 # See: https://gitlab.com/etke.cc/honoroit
 
@@ -7,7 +8,7 @@ matrix_bot_honoroit_container_image_self_build: false
 matrix_bot_honoroit_docker_repo: "https://gitlab.com/etke.cc/honoroit.git"
 matrix_bot_honoroit_docker_src_files_path: "{{ matrix_base_data_path }}/honoroit/docker-src"
 
-matrix_bot_honoroit_version: v0.9.2
+matrix_bot_honoroit_version: v0.9.4
 matrix_bot_honoroit_docker_image: "{{ matrix_bot_honoroit_docker_image_name_prefix }}honoroit:{{ matrix_bot_honoroit_version }}"
 matrix_bot_honoroit_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_image_self_build else 'registry.gitlab.com/etke.cc/' }}"
 matrix_bot_honoroit_docker_image_force_pull: "{{ matrix_bot_honoroit_docker_image.endswith(':latest') }}"
@@ -83,6 +84,12 @@ matrix_bot_honoroit_sentry: ''
 # Log level
 matrix_bot_honoroit_loglevel: ''
 
+# Text prefix: open
+matrix_bot_honoroit_text_prefix_open: ''
+
+# Text prefix: done
+matrix_bot_honoroit_text_prefix_done: ''
+
 # Text: greetings
 matrix_bot_honoroit_text_greetings: ''
 

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

@@ -1,3 +1,5 @@
+---
+
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-honoroit.service'] }}"
   when: matrix_bot_honoroit_enabled|bool

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -33,10 +33,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_bot_honoroit_config_path }}", when: true }
+    - {path: "{{ matrix_bot_honoroit_config_path }}", when: true}
-    - { path: "{{ matrix_bot_honoroit_data_path }}", when: true }
+    - {path: "{{ matrix_bot_honoroit_data_path }}", when: true}
-    - { path: "{{ matrix_bot_honoroit_data_store_path }}", when: true }
+    - {path: "{{ matrix_bot_honoroit_data_store_path }}", when: true}
-    - { path: "{{ matrix_bot_honoroit_docker_src_files_path }}", when: true}
+    - {path: "{{ matrix_bot_honoroit_docker_src_files_path }}", when: true}
   when: "item.when|bool"
 
 - name: Ensure honoroit environment variables file created
@@ -70,7 +70,7 @@
     build:
       dockerfile: Dockerfile
       path: "{{ matrix_bot_honoroit_docker_src_files_path }}"
-      pull: yes
+      pull: true
   when: "matrix_bot_honoroit_container_image_self_build|bool"
 
 - name: Ensure matrix-bot-honoroit.service installed
@@ -82,7 +82,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-honoroit.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_honoroit_systemd_service_result.changed|bool"
 
 - name: Ensure matrix-bot-honoroit.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-bot-honoroit
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   register: stopping_result
   when: "matrix_bot_honoroit_service_stat.stat.exists|bool"
 
@@ -22,7 +22,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-honoroit.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_honoroit_service_stat.stat.exists|bool"
 
 - name: Ensure Matrix honoroit paths don't exist

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

@@ -7,6 +7,8 @@ HONOROIT_DB_DIALECT={{ matrix_bot_honoroit_database_dialect }}
 HONOROIT_PREFIX={{ matrix_bot_honoroit_prefix }}
 HONOROIT_SENTRY={{ matrix_bot_honoroit_sentry }}
 HONOROIT_LOGLEVEL={{ matrix_bot_honoroit_loglevel }}
+HONOROIT_TEXT_PREFIX_OPEN={{ matrix_bot_honoroit_text_prefix_open }}
+HONOROIT_TEXT_PREFIX_DONE={{ matrix_bot_honoroit_text_prefix_done }}
 HONOROIT_TEXT_GREETINGS={{ matrix_bot_honoroit_text_greetings }}
 HONOROIT_TEXT_ERROR={{ matrix_bot_honoroit_text_error }}
 HONOROIT_TEXT_EMPTYROOM={{ matrix_bot_honoroit_text_emptyroom }}

roles/matrix-bot-honoroit/templates/systemd/matrix-bot-honoroit.service.j2

@@ -29,8 +29,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-honoroit \
 			{% endfor %}
 			{{ matrix_bot_honoroit_docker_image }}
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-honoroit 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-honoroit 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-honoroit 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-honoroit 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-bot-honoroit

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

@@ -1,3 +1,4 @@
+---
 # matrix-reminder-bot is a bot for one-off and recurring reminders
 # See: https://github.com/anoadragon453/matrix-reminder-bot
 

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

@@ -1,3 +1,5 @@
+---
+
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-matrix-reminder-bot.service'] }}"
   when: matrix_bot_matrix_reminder_bot_enabled|bool

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -34,10 +34,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_bot_matrix_reminder_bot_config_path }}", when: true }
+    - {path: "{{ matrix_bot_matrix_reminder_bot_config_path }}", when: true}
-    - { path: "{{ matrix_bot_matrix_reminder_bot_data_path }}", when: true }
+    - {path: "{{ matrix_bot_matrix_reminder_bot_data_path }}", when: true}
-    - { path: "{{ matrix_bot_matrix_reminder_bot_data_store_path }}", when: true }
+    - {path: "{{ matrix_bot_matrix_reminder_bot_data_store_path }}", when: true}
-    - { path: "{{ matrix_bot_matrix_reminder_bot_docker_src_files_path }}", when: true}
+    - {path: "{{ matrix_bot_matrix_reminder_bot_docker_src_files_path }}", when: true}
   when: "item.when|bool"
 
 - name: Ensure matrix-reminder-bot image is pulled
@@ -65,7 +65,7 @@
     build:
       dockerfile: docker/Dockerfile
       path: "{{ matrix_bot_matrix_reminder_bot_docker_src_files_path }}"
-      pull: yes
+      pull: true
   when: "matrix_bot_matrix_reminder_bot_container_image_self_build|bool"
 
 - name: Ensure matrix-reminder-bot config installed
@@ -85,7 +85,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-matrix-reminder-bot.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_matrix_reminder_bot_systemd_service_result.changed|bool"
 
 - name: Ensure matrix-bot-matrix-reminder-bot.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-bot-matrix-reminder-bot
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   register: stopping_result
   when: "matrix_bot_matrix_reminder_bot_service_stat.stat.exists|bool"
 
@@ -22,7 +22,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-matrix-reminder-bot.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_matrix_reminder_bot_service_stat.stat.exists|bool"
 
 - name: Ensure Matrix matrix-reminder-bot paths don't exist

roles/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2

@@ -32,8 +32,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-matrix-rem
 			{{ matrix_bot_matrix_reminder_bot_docker_image }} \
 			-c "matrix-reminder-bot /config/config.yaml"
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-matrix-reminder-bot 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-matrix-reminder-bot 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-matrix-reminder-bot 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-matrix-reminder-bot 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-bot-matrix-reminder-bot

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

@@ -1,9 +1,10 @@
+---
 # A moderation tool for Matrix
 # See: https://github.com/matrix-org/mjolnir
 
 matrix_bot_mjolnir_enabled: true
 
-matrix_bot_mjolnir_version: "v1.2.1"
+matrix_bot_mjolnir_version: "v1.3.1"
 
 matrix_bot_mjolnir_container_image_self_build: false
 matrix_bot_mjolnir_container_image_self_build_repo: "https://github.com/matrix-org/mjolnir.git"
@@ -56,4 +57,3 @@ matrix_bot_mjolnir_configuration_extension: "{{ matrix_bot_mjolnir_configuration
 # Holds the final configuration (a combination of the default and its extension).
 # You most likely don't need to touch this variable. Instead, see `matrix_bot_mjolnir_configuration_yaml`.
 matrix_bot_mjolnir_configuration: "{{ matrix_bot_mjolnir_configuration_yaml|from_yaml|combine(matrix_bot_mjolnir_configuration_extension, recursive=True) }}"
-

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

@@ -1,3 +1,4 @@
+---
 # See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
 # and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
 - name: Fail if trying to self-build on Ansible < 2.8

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -11,10 +11,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_bot_mjolnir_base_path }}", when: true }
+    - {path: "{{ matrix_bot_mjolnir_base_path }}", when: true}
-    - { path: "{{ matrix_bot_mjolnir_config_path }}", when: true }
+    - {path: "{{ matrix_bot_mjolnir_config_path }}", when: true}
-    - { path: "{{ matrix_bot_mjolnir_data_path }}", when: true }
+    - {path: "{{ matrix_bot_mjolnir_data_path }}", when: true}
-    - { path: "{{ matrix_bot_mjolnir_docker_src_files_path }}", when: "{{ matrix_bot_mjolnir_container_image_self_build }}" }
+    - {path: "{{ matrix_bot_mjolnir_docker_src_files_path }}", when: "{{ matrix_bot_mjolnir_container_image_self_build }}"}
   when: "item.when|bool"
 
 - name: Ensure mjolnir Docker image is pulled
@@ -42,7 +42,7 @@
     build:
       dockerfile: Dockerfile
       path: "{{ matrix_bot_mjolnir_docker_src_files_path }}"
-      pull: yes
+      pull: true
   when: "matrix_bot_mjolnir_container_image_self_build|bool"
 
 - name: Ensure matrix-bot-mjolnir config installed
@@ -62,7 +62,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-mjolnir.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_mjolnir_systemd_service_result.changed|bool"
 
 - name: Ensure matrix-bot-mjolnir.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-bot-mjolnir
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   register: stopping_result
   when: "matrix_bot_mjolnir_service_stat.stat.exists|bool"
 
@@ -22,7 +22,7 @@
 
 - name: Ensure systemd reloaded after matrix-bot-mjolnir.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_bot_mjolnir_service_stat.stat.exists|bool"
 
 - name: Ensure matrix-bot-mjolnir paths don't exist

roles/matrix-bot-mjolnir/templates/systemd/matrix-bot-mjolnir.service.j2

@@ -32,8 +32,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-mjolnir \
 			{% endfor %}
 			{{ matrix_bot_mjolnir_docker_image }}
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-mjolnir 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-mjolnir 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-mjolnir 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-mjolnir 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-bot-mjolnir

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

@@ -1,3 +1,4 @@
+---
 # matrix-appservice-discord is a Matrix <-> Discord bridge
 # See: https://github.com/Half-Shot/matrix-appservice-discord
 

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

@@ -1,3 +1,4 @@
+---
 # If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
 # We don't want to fail in such cases.
 - name: Fail if matrix-synapse role already executed

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -54,8 +54,8 @@
   service:
     name: matrix-appservice-discord
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   failed_when: false
   when: "matrix_appservice_discord_stat_db.stat.exists"
 
@@ -105,7 +105,7 @@
 
 - name: Ensure systemd reloaded after matrix-appservice-discord.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_discord_systemd_service_result.changed"
 
 - name: Ensure matrix-appservice-discord.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-appservice-discord
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_discord_service_stat.stat.exists"
 
 - name: Ensure matrix-appservice-discord.service doesn't exist
@@ -21,5 +21,5 @@
 
 - name: Ensure systemd reloaded after matrix-appservice-discord.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_discord_service_stat.stat.exists"

roles/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2

@@ -35,8 +35,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-appservice-dis
 			{{ matrix_appservice_discord_docker_image }} \
 			node /build/src/discordas.js -p 9005 -c /cfg/config.yaml -f /cfg/registration.yaml
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-appservice-discord 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-appservice-discord 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-appservice-discord 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-appservice-discord 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-appservice-discord

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

@@ -1,3 +1,4 @@
+---
 # Matrix Appservice IRC is a Matrix <-> IRC bridge
 # See: https://github.com/matrix-org/matrix-appservice-irc
 

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

@@ -1,3 +1,4 @@
+---
 # See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
 # and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
 - name: Fail if trying to self-build on Ansible < 2.8

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always

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

@@ -1,3 +1,5 @@
+---
+
 - name: Fail if Postgres not enabled
   fail:
     msg: "Postgres via the matrix-postgres role is not enabled (`matrix_postgres_enabled`). Cannot migrate."
@@ -16,7 +18,7 @@
   service:
     name: matrix-postgres
     state: started
-    daemon_reload: yes
+    daemon_reload: true
   register: matrix_postgres_service_start_result
 
 - name: Wait a bit, so that Postgres can start

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

@@ -1,5 +1,7 @@
 ---
 
+- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
+
 - name: Ensure Appservice IRC paths exist
   file:
     path: "{{ item.path }}"
@@ -8,10 +10,10 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_appservice_irc_base_path }}", when: true }
+    - {path: "{{ matrix_appservice_irc_base_path }}", when: true}
-    - { path: "{{ matrix_appservice_irc_config_path }}", when: true }
+    - {path: "{{ matrix_appservice_irc_config_path }}", when: true}
-    - { path: "{{ matrix_appservice_irc_data_path }}", when: true }
+    - {path: "{{ matrix_appservice_irc_data_path }}", when: true}
-    - { path: "{{ matrix_appservice_irc_docker_src_files_path }}", when: "{{ matrix_appservice_irc_container_image_self_build }}" }
+    - {path: "{{ matrix_appservice_irc_docker_src_files_path }}", when: "{{ matrix_appservice_irc_container_image_self_build }}"}
   when: item.when|bool
 
 - name: Check if an old passkey file already exists
@@ -24,7 +26,7 @@
       service:
         name: matrix-appservice-irc
         state: stopped
-        daemon_reload: yes
+        daemon_reload: true
       failed_when: false
 
     - name: (Data relocation) Move AppService IRC passkey.pem file to ./data directory
@@ -80,7 +82,7 @@
     build:
       dockerfile: Dockerfile
       path: "{{ matrix_appservice_irc_docker_src_files_path }}"
-      pull: yes
+      pull: true
   when: "matrix_appservice_irc_enabled|bool and matrix_appservice_irc_container_image_self_build|bool and matrix_appservice_irc_git_pull_results.changed"
 
 - name: Ensure Matrix Appservice IRC config installed
@@ -184,7 +186,7 @@
 
 - name: Ensure systemd reloaded after matrix-appservice-irc.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_irc_systemd_service_result.changed"
 
 - name: Ensure matrix-appservice-irc.service restarted, if necessary

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

@@ -9,8 +9,8 @@
   service:
     name: matrix-appservice-irc
     state: stopped
-    enabled: no
+    enabled: false
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_irc_service_stat.stat.exists"
 
 - name: Ensure matrix-appservice-irc.service doesn't exist
@@ -21,5 +21,5 @@
 
 - name: Ensure systemd reloaded after matrix-appservice-irc.service removal
   service:
-    daemon_reload: yes
+    daemon_reload: true
   when: "matrix_appservice_irc_service_stat.stat.exists"

roles/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2

@@ -36,8 +36,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-appservice-irc
 			{{ matrix_appservice_irc_docker_image }} \
 			-c 'node app.js -c /config/config.yaml -f /config/registration.yaml -p 9999'
 
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-appservice-irc 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-appservice-irc 2>/dev/null'
-ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-appservice-irc 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-appservice-irc 2>/dev/null'
 Restart=always
 RestartSec=30
 SyslogIdentifier=matrix-appservice-irc

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

@@ -1,3 +1,4 @@
+---
 # matrix-appservice-slack is a Matrix <-> Slack bridge
 # See: https://github.com/matrix-org/matrix-appservice-slack
 

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

@@ -1,3 +1,4 @@
+---
 # See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
 # and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
 - name: Fail if trying to self-build on Ansible < 2.8

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

@@ -1,3 +1,5 @@
+---
+
 - import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always