|
12 | 12 | 'matrix_client_element_jitsi_preferredDomain': 'jitsi.{{ matrix_domain }}' |
13 | 13 | 'matrix_client_element_default_theme': '{{ matrix_client_element_default_theme }}' |
14 | 14 | '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 }}' |
19 | 19 |
|
20 | 20 | - name: Record Element-Web custom variables locally on AWX |
21 | 21 | delegate_to: 127.0.0.1 |
|
25 | 25 | line: "{{ item.key }}: '{{ item.value }}'" |
26 | 26 | insertbefore: '# Element Settings End' |
27 | 27 | 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 }}' |
30 | 30 |
|
31 | 31 | - name: Set Element-Web custom branding locally on AWX |
32 | 32 | delegate_to: 127.0.0.1 |
|
135 | 135 | line: "{{ item.key }}: '{{ item.value }}'" |
136 | 136 | insertafter: '# Element Settings Start' |
137 | 137 | 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 |
140 | 140 |
|
141 | 141 | - name: Remove Element-Web background locally on AWX if not defined |
142 | 142 | delegate_to: 127.0.0.1 |
143 | 143 | lineinfile: |
144 | 144 | path: '{{ awx_cached_matrix_vars }}' |
145 | 145 | regexp: "^matrix_client_element_branding_welcomeBackgroundUrl: " |
146 | 146 | state: absent |
147 | | - when: awx_matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0 |
| 147 | + when: matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0 |
148 | 148 |
|
149 | 149 | - name: Save new 'Configure Element' survey.json to the AWX tower, template |
150 | 150 | delegate_to: 127.0.0.1 |
|
0 commit comments