Skip to content

Commit 8ff0ae2

Browse files
update element section
1 parent 9f0a896 commit 8ff0ae2

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

roles/matrix-awx/surveys/configure_element.json.j2

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"required": false,
5757
"min": 0,
5858
"max": 1024,
59-
"default": "{{ awx_matrix_client_element_welcome_logo }}",
59+
"default": "{{ matrix_client_element_welcome_logo }}",
6060
"choices": "",
6161
"new_question": true,
62-
"variable": "awx_matrix_client_element_welcome_logo",
62+
"variable": "matrix_client_element_welcome_logo",
6363
"type": "text"
6464
},
6565
{
@@ -68,10 +68,10 @@
6868
"required": false,
6969
"min": 0,
7070
"max": 1024,
71-
"default": "{{ awx_matrix_client_element_welcome_logo_link }}",
71+
"default": "{{ matrix_client_element_welcome_logo_link }}",
7272
"choices": "",
7373
"new_question": true,
74-
"variable": "awx_matrix_client_element_welcome_logo_link",
74+
"variable": "matrix_client_element_welcome_logo_link",
7575
"type": "text"
7676
},
7777
{
@@ -80,10 +80,10 @@
8080
"required": false,
8181
"min": 0,
8282
"max": 512,
83-
"default": "{{ awx_matrix_client_element_welcome_headline }}",
83+
"default": "{{ matrix_client_element_welcome_headline }}",
8484
"choices": "",
8585
"new_question": true,
86-
"variable": "awx_matrix_client_element_welcome_headline",
86+
"variable": "matrix_client_element_welcome_headline",
8787
"type": "text"
8888
},
8989
{
@@ -92,10 +92,10 @@
9292
"required": false,
9393
"min": 0,
9494
"max": 2048,
95-
"default": "{{ awx_matrix_client_element_welcome_text }}",
95+
"default": "{{ matrix_client_element_welcome_text }}",
9696
"choices": "",
9797
"new_question": true,
98-
"variable": "awx_matrix_client_element_welcome_text",
98+
"variable": "matrix_client_element_welcome_text",
9999
"type": "text"
100100
},
101101
{

roles/matrix-awx/tasks/set_variables_element.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
line: "{{ item.key }}: '{{ item.value }}'"
4444
insertafter: '# Element Settings Start'
4545
with_dict:
46-
'matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
47-
when: ( awx_https_string in awx_matrix_client_element_welcome_logo ) and ( awx_matrix_client_element_welcome_logo | trim | length > 0 )
46+
'matrix_client_element_welcome_logo': '{{ matrix_client_element_welcome_logo }}'
47+
when: ( awx_https_string in matrix_client_element_welcome_logo ) and ( matrix_client_element_welcome_logo | trim | length > 0 )
4848

4949
- name: Remove custom logo locally on AWX if not defined
5050
delegate_to: 127.0.0.1
5151
lineinfile:
5252
path: '{{ awx_cached_matrix_vars }}'
5353
regexp: "^matrix_client_element_welcome_logo: "
5454
state: absent
55-
when: awx_matrix_client_element_welcome_logo | trim | length == 0
55+
when: matrix_client_element_welcome_logo | trim | length == 0
5656

5757
- name: Set custom logo link locally on AWX if defined
5858
delegate_to: 127.0.0.1
@@ -62,16 +62,16 @@
6262
line: "{{ item.key }}: '{{ item.value }}'"
6363
insertafter: '# Element Settings Start'
6464
with_dict:
65-
'matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}'
66-
when: ( awx_https_string in awx_matrix_client_element_welcome_logo_link ) and ( awx_matrix_client_element_welcome_logo_link | trim | length > 0 )
65+
'matrix_client_element_welcome_logo_link': '{{ matrix_client_element_welcome_logo_link }}'
66+
when: ( awx_https_string in matrix_client_element_welcome_logo_link ) and ( matrix_client_element_welcome_logo_link | trim | length > 0 )
6767

6868
- name: Remove custom logo link locally on AWX if not defined
6969
delegate_to: 127.0.0.1
7070
lineinfile:
7171
path: '{{ awx_cached_matrix_vars }}'
7272
regexp: "^matrix_client_element_welcome_logo_link: "
7373
state: absent
74-
when: awx_matrix_client_element_welcome_logo_link | trim | length == 0
74+
when: matrix_client_element_welcome_logo_link | trim | length == 0
7575

7676
- name: Set custom headline locally on AWX if defined
7777
delegate_to: 127.0.0.1
@@ -81,16 +81,16 @@
8181
line: "{{ item.key }}: '{{ item.value }}'"
8282
insertafter: '# Element Settings Start'
8383
with_dict:
84-
'matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}'
85-
when: awx_matrix_client_element_welcome_headline | trim | length > 0
84+
'matrix_client_element_welcome_headline': '{{ matrix_client_element_welcome_headline }}'
85+
when: matrix_client_element_welcome_headline | trim | length > 0
8686

8787
- name: Remove custom headline locally on AWX if not defined
8888
delegate_to: 127.0.0.1
8989
lineinfile:
9090
path: '{{ awx_cached_matrix_vars }}'
9191
regexp: "^matrix_client_element_welcome_headline: "
9292
state: absent
93-
when: awx_matrix_client_element_welcome_headline | trim | length == 0
93+
when: matrix_client_element_welcome_headline | trim | length == 0
9494

9595
- name: Set custom text locally on AWX if defined
9696
delegate_to: 127.0.0.1
@@ -100,16 +100,16 @@
100100
line: "{{ item.key }}: '{{ item.value }}'"
101101
insertafter: '# Element Settings Start'
102102
with_dict:
103-
'matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}'
104-
when: awx_matrix_client_element_welcome_text | trim | length > 0
103+
'matrix_client_element_welcome_text': '{{ matrix_client_element_welcome_text }}'
104+
when: matrix_client_element_welcome_text | trim | length > 0
105105

106106
- name: Remove custom text locally on AWX if not defined
107107
delegate_to: 127.0.0.1
108108
lineinfile:
109109
path: '{{ awx_cached_matrix_vars }}'
110110
regexp: "^matrix_client_element_welcome_text: "
111111
state: absent
112-
when: awx_matrix_client_element_welcome_text | trim | length == 0
112+
when: matrix_client_element_welcome_text | trim | length == 0
113113

114114
- name: Set element-web background locally on AWX if defined
115115
delegate_to: 127.0.0.1

0 commit comments

Comments
 (0)