Skip to content

Commit 1f9872f

Browse files
spantaleevignyx
authored andcommitted
Remove welcome_user_id from Element and Schildichat
Ref: - matrix-org/matrix-react-sdk#12153 - element-hq/element-web#26885 Technically, it may still work for Schildichat, because it's stuck in the past. It will catch up soon anyway.
1 parent fab3c21 commit 1f9872f

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

group_vars/matrix_servers

-4
Original file line numberDiff line numberDiff line change
@@ -3901,8 +3901,6 @@ matrix_client_element_enable_presence_by_hs_url: |
39013901
else {matrix_client_element_default_hs_url: false}
39023902
}}
39033903

3904-
matrix_client_element_welcome_user_id: ~
3905-
39063904
matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
39073905

39083906
######################################################################
@@ -4014,8 +4012,6 @@ matrix_client_schildichat_enable_presence_by_hs_url: |
40144012
else {matrix_client_schildichat_default_hs_url: false}
40154013
}}
40164014

4017-
matrix_client_schildichat_welcome_user_id: ~
4018-
40194015
matrix_client_schildichat_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
40204016

40214017
######################################################################

roles/custom/matrix-client-element/defaults/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ matrix_client_element_bug_report_endpoint_url: "https://element.io/bugreports/su
151151
matrix_client_element_show_lab_settings: true # noqa var-naming
152152
# Element public room directory server(s)
153153
matrix_client_element_room_directory_servers: ['matrix.org']
154-
matrix_client_element_welcome_user_id: ~
155154
# Branding of Element
156155
matrix_client_element_brand: "Element"
157156

roles/custom/matrix-client-element/tasks/validate_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
- {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
4444
- {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
4545
- {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
46+
- {'old': 'matrix_client_element_welcome_user_id', 'new': '<removed>'}
4647

4748
- when: matrix_client_element_container_labels_traefik_enabled | bool
4849
block:

roles/custom/matrix-client-element/templates/config.json.j2

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"room_directory": {
2727
"servers": {{ matrix_client_element_room_directory_servers | to_json }}
2828
},
29-
"welcome_user_id": {{ matrix_client_element_welcome_user_id | to_json }},
3029
{% if matrix_client_element_enable_presence_by_hs_url is not none %}
3130
"enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }},
3231
{% endif %}

roles/custom/matrix-client-schildichat/defaults/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ matrix_client_schildichat_bug_report_endpoint_url: "https://element.io/bugreport
145145
matrix_client_schildichat_show_lab_settings: true # noqa var-naming
146146
# schildichat public room directory server(s)
147147
matrix_client_schildichat_room_directory_servers: ['matrix.org']
148-
matrix_client_schildichat_welcome_user_id: ~
149148
# Branding of schildichat
150149
matrix_client_schildichat_brand: "schildichat"
151150

roles/custom/matrix-client-schildichat/tasks/validate_config.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22

3+
- name: (Deprecation) Catch and report renamed Schildichat settings
4+
ansible.builtin.fail:
5+
msg: >-
6+
Your configuration contains a variable, which now has a different name.
7+
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
8+
when: "item.old in vars"
9+
with_items:
10+
- {'old': 'matrix_client_schildichat_welcome_user_id', 'new': '<removed>'}
11+
312
- name: Fail if required schildichat settings not defined
413
ansible.builtin.fail:
514
msg: >

roles/custom/matrix-client-schildichat/templates/config.json.j2

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"room_directory": {
2727
"servers": {{ matrix_client_schildichat_room_directory_servers | to_json }}
2828
},
29-
"welcome_user_id": {{ matrix_client_schildichat_welcome_user_id | to_json }},
3029
{% if matrix_client_schildichat_enable_presence_by_hs_url is not none %}
3130
"enable_presence_by_hs_url": {{ matrix_client_schildichat_enable_presence_by_hs_url | to_json }},
3231
{% endif %}

0 commit comments

Comments
 (0)