From b2b6edc8a14e3d5c14c57b9a72700a1eeb18a40c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:23:48 +0000 Subject: [PATCH 1/3] chore(deps): update halfshot/matrix-hookshot docker tag to v5.1.2 --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index 7d6c4e7df..69a33f61d 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -17,7 +17,7 @@ matrix_hookshot_container_additional_networks_auto: [] matrix_hookshot_container_additional_networks_custom: [] # renovate: datasource=docker depName=halfshot/matrix-hookshot -matrix_hookshot_version: 5.1.1 +matrix_hookshot_version: 5.1.2 matrix_hookshot_docker_image: "{{ matrix_hookshot_docker_image_name_prefix }}halfshot/matrix-hookshot:{{ matrix_hookshot_version }}" matrix_hookshot_docker_image_name_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_container_global_registry_prefix }}" From c76aaf2e0b2b894657500e25b30e1ab0e2dce1c4 Mon Sep 17 00:00:00 2001 From: Pierre 'McFly' Marty Date: Tue, 2 Jan 2024 21:44:36 +0200 Subject: [PATCH 2/3] fix(signal): tag follows declared version --- roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index 3b2f58e3c..1a34284f9 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -13,7 +13,7 @@ matrix_mautrix_signal_version: 18e006300885e7432f0791211dec77345ae974a2 # 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 }}" -matrix_mautrix_signal_docker_image_tag: "18e006300885e7432f0791211dec77345ae974a2-{{ matrix_architecture }}" +matrix_mautrix_signal_docker_image_tag: "{{ 'latest' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version + '-' + matrix_architecture }}" matrix_mautrix_signal_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_signal_container_image_self_build else 'dock.mau.dev/' }}" matrix_mautrix_signal_docker_image_force_pull: "{{ matrix_mautrix_signal_docker_image.endswith(':latest') }}" From 61bf368080d564dc4e1293cea0b9ad8cddd5ef80 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 3 Jan 2024 13:09:45 +0200 Subject: [PATCH 3/3] Mark /.well-known/matrix/support as accepted spec --- docs/configuring-well-known.md | 5 +---- roles/custom/matrix-base/defaults/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index 993578159..f53ce2f78 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -38,16 +38,13 @@ To learn how to set it up, read the Installing section below. ## (Optional) Introduction to Homeserver Admin Contact and Support page -[MSC 1929](https://github.com/matrix-org/matrix-spec-proposals/pull/1929) specifies a way to add contact details of admins, as well as a link to a support page for users who are having issues with the service. - -This MSC did not get accepted yet, but we think it might already be useful to Homeserver admins who wish to provide this information to end-users. +[MSC 1929](https://github.com/matrix-org/matrix-spec-proposals/pull/1929) specifies a way to add contact details of admins, as well as a link to a support page for users who are having issues with the service. Automated services may also index this information and use it for abuse reports, etc. The two playbook variables that you could look for, if you're interested in being an early adopter, are: `matrix_homeserver_admin_contacts` and `matrix_homeserver_support_url`. Example snippet for `vars.yml`: ``` # Enable generation of `/.well-known/matrix/support`. -# This needs to be enabled explicitly for now, because MSC 1929 is not yet accepted. matrix_well_known_matrix_support_enabled: true # Homeserver admin contacts as per MSC 1929 https://github.com/matrix-org/matrix-spec-proposals/pull/1929 diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 183f1db33..ff92be687 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -285,9 +285,9 @@ matrix_docker_network: "matrix" matrix_well_known_matrix_server_enabled: true # Controls whether a `/.well-known/matrix/support` file is generated and used at all. +# For details about this file, see the spec: https://github.com/matrix-org/matrix-spec-proposals/pull/1929 # -# This is not enabled by default, until the MSC gets accepted: https://github.com/matrix-org/matrix-spec-proposals/pull/1929 -# +# This is not enabled by default, as for it to be useful, other information is necessary. # See `matrix_homeserver_admin_contacts`, `matrix_homeserver_support_url`, etc. matrix_well_known_matrix_support_enabled: false