From d89e627a799e3ab563974a3f076c13309197bd3b Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 23 Dec 2024 08:59:04 +0200 Subject: [PATCH] Move some matrix-registration-bot variables around --- .../defaults/main.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml b/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml index 3f43ed920..ba1fc7273 100644 --- a/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml +++ b/roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml @@ -20,12 +20,19 @@ matrix_bot_matrix_registration_bot_config_path: "{{ matrix_bot_matrix_registrati matrix_bot_matrix_registration_bot_data_path: "{{ matrix_bot_matrix_registration_bot_base_path }}/data" matrix_bot_matrix_registration_bot_bot_server: "{{ matrix_homeserver_url }}" -matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_homeserver_url }}" +# The bot's username. This user needs to be created manually beforehand. +# Also see `matrix_bot_matrix_registration_bot_user_password`. +matrix_bot_matrix_registration_bot_matrix_user_id_localpart: "bot.matrix-registration-bot" + +matrix_bot_matrix_registration_bot_matrix_user_id: '@{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}:{{ matrix_domain }}' # The bot's password (can also be used to login via a client like Element Web) matrix_bot_matrix_registration_bot_bot_password: '' +# Homeserver base URL +matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_homeserver_url }}" + # Optional variable that only needs to be set if the bot account is not admin # Needs to be a valid access token of an admin account matrix_bot_matrix_registration_bot_api_token: '' @@ -51,9 +58,3 @@ matrix_bot_matrix_registration_bot_systemd_required_services_list_custom: [] # List of systemd services that matrix-bot-matrix-registration-bot.service wants matrix_bot_matrix_registration_bot_systemd_wanted_services_list: [] - -# The bot's username. This user needs to be created manually beforehand. -# Also see `matrix_bot_matrix_registration_bot_user_password`. -matrix_bot_matrix_registration_bot_matrix_user_id_localpart: "bot.matrix-registration-bot" - -matrix_bot_matrix_registration_bot_matrix_user_id: '@{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}:{{ matrix_domain }}'