From d1fa7378f73f58fd8d89948af8d6de177f55caf7 Mon Sep 17 00:00:00 2001 From: janonym1 <79254796+janonym1@users.noreply.github.com> Date: Fri, 6 Dec 2024 04:21:34 +0100 Subject: [PATCH] hookshot: Allow the localpart of the hookshot-bot to be defined (#3853) * set localpart of hookshot bot in main.yml * set sender_localpart in registration.yml.j2 template to variable * prettier location for bot localpart in main.yml * Update main.yml * Update registration.yml.j2 --------- Co-authored-by: Slavi Pantaleev --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 3 +++ .../matrix-bridge-hookshot/templates/registration.yml.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index 88542d9eec9..5b1d6e21050 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -30,6 +30,9 @@ matrix_hookshot_docker_src_files_path: "{{ matrix_hookshot_base_path }}/docker-s matrix_hookshot_homeserver_address: "" matrix_hookshot_container_url: 'matrix-hookshot' +# Sets the localpart of the Matrix ID for the hookshot bot +matrix_hookshot_bot_localpart: "hookshot" + matrix_hookshot_public_scheme: https matrix_hookshot_public_hostname: "{{ matrix_server_fqn_matrix }}" matrix_hookshot_public_endpoint: /hookshot diff --git a/roles/custom/matrix-bridge-hookshot/templates/registration.yml.j2 b/roles/custom/matrix-bridge-hookshot/templates/registration.yml.j2 index 0f76b1c0587..bb3dc34d123 100644 --- a/roles/custom/matrix-bridge-hookshot/templates/registration.yml.j2 +++ b/roles/custom/matrix-bridge-hookshot/templates/registration.yml.j2 @@ -25,7 +25,7 @@ namespaces: - regex: "#github_.+:{{ matrix_domain }}" exclusive: true -sender_localpart: hookshot +sender_localpart: {{ matrix_hookshot_bot_localpart | to_json }} url: "http://{{ matrix_hookshot_container_url }}:{{ matrix_hookshot_appservice_port }}" # This should match the bridge.port in your config file rate_limited: false