Skip to content

Commit 46cba52

Browse files
update element section
1 parent b4654f8 commit 46cba52

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

roles/matrix-awx/tasks/set_variables_element.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
'matrix_client_element_jitsi_preferredDomain': 'jitsi.{{ matrix_domain }}'
1313
'matrix_client_element_default_theme': '{{ matrix_client_element_default_theme }}'
1414
'matrix_client_element_registration_enabled': '{{ matrix_client_element_registration_enabled }}'
15-
'matrix_client_element_brand': '{{ matrix_client_element_brand }}'
16-
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl }}'
17-
'matrix_client_element_welcome_logo': '{{ matrix_client_element_welcome_logo }}'
18-
'matrix_client_element_welcome_logo_link': '{{ matrix_client_element_welcome_logo_link }}'
15+
'matrix_client_element_brand': '{{ matrix_client_element_brand | trim }}'
16+
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl | trim }}'
17+
'matrix_client_element_welcome_logo': '{{ matrix_client_element_welcome_logo | trim }}'
18+
'matrix_client_element_welcome_logo_link': '{{ matrix_client_element_welcome_logo_link | trim }}'
1919

2020
- name: Record Element-Web custom variables locally on AWX
2121
delegate_to: 127.0.0.1
@@ -25,8 +25,8 @@
2525
line: "{{ item.key }}: '{{ item.value }}'"
2626
insertbefore: '# Element Settings End'
2727
with_dict:
28-
'awx_matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}'
29-
'awx_matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}'
28+
'awx_matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline | trim }}'
29+
'awx_matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text | trim }}'
3030

3131
- name: Set Element-Web custom branding locally on AWX
3232
delegate_to: 127.0.0.1
@@ -135,16 +135,16 @@
135135
line: "{{ item.key }}: '{{ item.value }}'"
136136
insertafter: '# Element Settings Start'
137137
with_dict:
138-
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ awx_matrix_client_element_branding_welcomeBackgroundUrl }}'
139-
when: awx_matrix_client_element_branding_welcomeBackgroundUrl | trim | length > 0
138+
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl }}'
139+
when: matrix_client_element_branding_welcomeBackgroundUrl | trim | length > 0
140140

141141
- name: Remove Element-Web background locally on AWX if not defined
142142
delegate_to: 127.0.0.1
143143
lineinfile:
144144
path: '{{ awx_cached_matrix_vars }}'
145145
regexp: "^matrix_client_element_branding_welcomeBackgroundUrl: "
146146
state: absent
147-
when: awx_matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0
147+
when: matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0
148148

149149
- name: Save new 'Configure Element' survey.json to the AWX tower, template
150150
delegate_to: 127.0.0.1

0 commit comments

Comments
 (0)