Skip to content

Commit 53f4b84

Browse files
GoMatrixHostingGoMatrixHosting
committed
update element section
1 parent 8ff0ae2 commit 53f4b84

File tree

2 files changed

+43
-28
lines changed

2 files changed

+43
-28
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"required": false,
3333
"min": 0,
3434
"max": 256,
35-
"default": "{{ matrix_client_element_brand }}",
35+
"default": "{{ awx_matrix_client_element_brand }}",
3636
"choices": "",
3737
"new_question": true,
38-
"variable": "matrix_client_element_brand",
38+
"variable": "awx_matrix_client_element_brand",
3939
"type": "text"
4040
},
4141
{
@@ -44,10 +44,10 @@
4444
"required": false,
4545
"min": 0,
4646
"max": 1024,
47-
"default": "{{ matrix_client_element_branding_welcomeBackgroundUrl }}",
47+
"default": "{{ awx_matrix_client_element_branding_welcomeBackgroundUrl }}",
4848
"choices": "",
4949
"new_question": true,
50-
"variable": "matrix_client_element_branding_welcomeBackgroundUrl",
50+
"variable": "awx_matrix_client_element_branding_welcomeBackgroundUrl",
5151
"type": "text"
5252
},
5353
{
@@ -56,10 +56,10 @@
5656
"required": false,
5757
"min": 0,
5858
"max": 1024,
59-
"default": "{{ matrix_client_element_welcome_logo }}",
59+
"default": "{{ awx_matrix_client_element_welcome_logo }}",
6060
"choices": "",
6161
"new_question": true,
62-
"variable": "matrix_client_element_welcome_logo",
62+
"variable": "awx_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": "{{ matrix_client_element_welcome_logo_link }}",
71+
"default": "{{ awx_matrix_client_element_welcome_logo_link }}",
7272
"choices": "",
7373
"new_question": true,
74-
"variable": "matrix_client_element_welcome_logo_link",
74+
"variable": "awx_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": "{{ matrix_client_element_welcome_headline }}",
83+
"default": "{{ awx_matrix_client_element_welcome_headline }}",
8484
"choices": "",
8585
"new_question": true,
86-
"variable": "matrix_client_element_welcome_headline",
86+
"variable": "awx_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": "{{ matrix_client_element_welcome_text }}",
95+
"default": "{{ awx_matrix_client_element_welcome_text }}",
9696
"choices": "",
9797
"new_question": true,
98-
"variable": "matrix_client_element_welcome_text",
98+
"variable": "awx_matrix_client_element_welcome_text",
9999
"type": "text"
100100
},
101101
{

‎roles/matrix-awx/tasks/set_variables_element.yml‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@
1313
'matrix_client_element_default_theme': '{{ matrix_client_element_default_theme }}'
1414
'matrix_client_element_registration_enabled': '{{ matrix_client_element_registration_enabled }}'
1515

16+
- name: Record Synapse Custom variables locally on AWX
17+
delegate_to: 127.0.0.1
18+
lineinfile:
19+
path: '{{ awx_cached_matrix_vars }}'
20+
regexp: "^#? *{{ item.key | regex_escape() }}:"
21+
line: "{{ item.key }}: '{{ item.value }}'"
22+
insertbefore: '# Element Settings End'
23+
with_dict:
24+
'awx_matrix_client_element_brand': '{{ awx_matrix_client_element_brand }}'
25+
'awx_matrix_client_element_branding_welcomeBackgroundUrl:' '{{ awx_matrix_client_element_branding_welcomeBackgroundUrl }}'
26+
'awx_matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
27+
'awx_matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}'
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 }}'
30+
1631
- name: Set custom branding locally on AWX
1732
delegate_to: 127.0.0.1
1833
lineinfile:
@@ -21,15 +36,15 @@
2136
line: "{{ item.key }}: '{{ item.value }}'"
2237
insertafter: '# Element Settings Start'
2338
with_dict:
24-
'matrix_client_element_brand': "{{ matrix_client_element_brand }}"
39+
'matrix_client_element_brand': "{{ awx_matrix_client_element_brand }}"
2540

2641
- name: Remove custom branding locally on AWX if not defined
2742
delegate_to: 127.0.0.1
2843
lineinfile:
2944
path: '{{ awx_cached_matrix_vars }}'
3045
regexp: "^matrix_client_element_brand: "
3146
state: absent
32-
when: matrix_client_element_brand | trim | length == 0
47+
when: awx_matrix_client_element_brand | trim | length == 0
3348

3449
- name: Set fact for 'https' string
3550
set_fact:
@@ -43,16 +58,16 @@
4358
line: "{{ item.key }}: '{{ item.value }}'"
4459
insertafter: '# Element Settings Start'
4560
with_dict:
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 )
61+
'matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
62+
when: ( awx_https_string in awx_matrix_client_element_welcome_logo ) and ( awx_matrix_client_element_welcome_logo | trim | length > 0 )
4863

4964
- name: Remove custom logo locally on AWX if not defined
5065
delegate_to: 127.0.0.1
5166
lineinfile:
5267
path: '{{ awx_cached_matrix_vars }}'
5368
regexp: "^matrix_client_element_welcome_logo: "
5469
state: absent
55-
when: matrix_client_element_welcome_logo | trim | length == 0
70+
when: awx_matrix_client_element_welcome_logo | trim | length == 0
5671

5772
- name: Set custom logo link locally on AWX if defined
5873
delegate_to: 127.0.0.1
@@ -63,15 +78,15 @@
6378
insertafter: '# Element Settings Start'
6479
with_dict:
6580
'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 )
81+
when: ( awx_https_string in awx_matrix_client_element_welcome_logo_link ) and ( awx_matrix_client_element_welcome_logo_link | trim | length > 0 )
6782

6883
- name: Remove custom logo link locally on AWX if not defined
6984
delegate_to: 127.0.0.1
7085
lineinfile:
7186
path: '{{ awx_cached_matrix_vars }}'
7287
regexp: "^matrix_client_element_welcome_logo_link: "
7388
state: absent
74-
when: matrix_client_element_welcome_logo_link | trim | length == 0
89+
when: awx_matrix_client_element_welcome_logo_link | trim | length == 0
7590

7691
- name: Set custom headline locally on AWX if defined
7792
delegate_to: 127.0.0.1
@@ -81,16 +96,16 @@
8196
line: "{{ item.key }}: '{{ item.value }}'"
8297
insertafter: '# Element Settings Start'
8398
with_dict:
84-
'matrix_client_element_welcome_headline': '{{ matrix_client_element_welcome_headline }}'
85-
when: matrix_client_element_welcome_headline | trim | length > 0
99+
'matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}'
100+
when: awx_matrix_client_element_welcome_headline | trim | length > 0
86101

87102
- name: Remove custom headline locally on AWX if not defined
88103
delegate_to: 127.0.0.1
89104
lineinfile:
90105
path: '{{ awx_cached_matrix_vars }}'
91106
regexp: "^matrix_client_element_welcome_headline: "
92107
state: absent
93-
when: matrix_client_element_welcome_headline | trim | length == 0
108+
when: awx_matrix_client_element_welcome_headline | trim | length == 0
94109

95110
- name: Set custom text locally on AWX if defined
96111
delegate_to: 127.0.0.1
@@ -100,16 +115,16 @@
100115
line: "{{ item.key }}: '{{ item.value }}'"
101116
insertafter: '# Element Settings Start'
102117
with_dict:
103-
'matrix_client_element_welcome_text': '{{ matrix_client_element_welcome_text }}'
104-
when: matrix_client_element_welcome_text | trim | length > 0
118+
'matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}'
119+
when: awx_matrix_client_element_welcome_text | trim | length > 0
105120

106121
- name: Remove custom text locally on AWX if not defined
107122
delegate_to: 127.0.0.1
108123
lineinfile:
109124
path: '{{ awx_cached_matrix_vars }}'
110125
regexp: "^matrix_client_element_welcome_text: "
111126
state: absent
112-
when: matrix_client_element_welcome_text | trim | length == 0
127+
when: awx_matrix_client_element_welcome_text | trim | length == 0
113128

114129
- name: Set element-web background locally on AWX if defined
115130
delegate_to: 127.0.0.1
@@ -119,16 +134,16 @@
119134
line: "{{ item.key }}: '{{ item.value }}'"
120135
insertafter: '# Element Settings Start'
121136
with_dict:
122-
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl }}'
123-
when: matrix_client_element_branding_welcomeBackgroundUrl | trim | length > 0
137+
'matrix_client_element_branding_welcomeBackgroundUrl': '{{ awx_matrix_client_element_branding_welcomeBackgroundUrl }}'
138+
when: awx_matrix_client_element_branding_welcomeBackgroundUrl | trim | length > 0
124139

125140
- name: Remove element-web background locally on AWX if not defined
126141
delegate_to: 127.0.0.1
127142
lineinfile:
128143
path: '{{ awx_cached_matrix_vars }}'
129144
regexp: "^matrix_client_element_branding_welcomeBackgroundUrl: "
130145
state: absent
131-
when: matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0
146+
when: awx_matrix_client_element_branding_welcomeBackgroundUrl | trim | length == 0
132147

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

0 commit comments

Comments
 (0)