Skip to content

Commit 4d39efe

Browse files
committed
Rename variable (matrix_bot_matrix_registration_bot_matrix_homeserver_url -> matrix_bot_matrix_registration_bot_api_base_url)
We were overriding the `matrix_bot_matrix_registration_bot_matrix_homeserver_url` variable via `group_vars/matrix_servers` to point it to the container-local homeserver URL, but this variable was not being used at all. The actual variable name (which was being used) is `matrix_bot_matrix_registration_bot_api_base_url`. Fixes #3898
1 parent 358b348 commit 4d39efe

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

group_vars/matrix_servers

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2737,7 +2737,7 @@ matrix_bot_matrix_registration_bot_container_additional_networks_auto: |-
27372737
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
27382738
}}
27392739

2740-
matrix_bot_matrix_registration_bot_matrix_homeserver_url: "{{ matrix_addons_homeserver_client_api_url }}"
2740+
matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_addons_homeserver_client_api_url }}"
27412741

27422742
######################################################################
27432743
#

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,3 @@ matrix_bot_matrix_registration_bot_systemd_wanted_services_list: []
5757
matrix_bot_matrix_registration_bot_matrix_user_id_localpart: "bot.matrix-registration-bot"
5858

5959
matrix_bot_matrix_registration_bot_matrix_user_id: '@{{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}:{{ matrix_domain }}'
60-
61-
matrix_bot_matrix_registration_bot_matrix_homeserver_url: ""

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
when: "vars[item] == ''"
88
with_items:
99
- "matrix_bot_matrix_registration_bot_bot_password"
10-
- "matrix_bot_matrix_registration_bot_matrix_homeserver_url"
10+
- "matrix_bot_matrix_registration_bot_api_base_url"
1111

12-
- name: (Deprecation) Catch and report old settings
12+
- name: (Deprecation) Catch and report renamed settings
1313
ansible.builtin.fail:
1414
msg: >-
15-
Your configuration contains a variable, which is deprecated - Please check the documentation on how to configure the matrix-registration-bot.
16-
when: "item in vars"
15+
Your configuration contains a variable, which now has a different name.
16+
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
17+
when: "item.old in vars"
1718
with_items:
18-
- "matrix_bot_matrix_registration_bot_bot_access_token"
19+
- {'old': 'matrix_bot_matrix_registration_bot_bot_access_token', 'new': '<removed>'}
20+
- {'old': 'matrix_bot_matrix_registration_bot_matrix_homeserver_url', 'new': 'matrix_bot_matrix_registration_bot_api_base_url'}

0 commit comments

Comments
 (0)