Skip to content

Commit 0c21b5a

Browse files
spantaleevspantaleev
authored
Merge pull request #1326 from GoMatrixHosting/gomatrixhosting-testing
GoMatrixHosting v0.6.2
2 parents 1cde9f8 + fc0296b commit 0c21b5a

38 files changed

+554
-366
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"required": true,
99
"min": null,
1010
"max": null,
11-
"default": "{{ sftp_auth_method | string }}",
11+
"default": "{{ awx_sftp_auth_method | string }}",
1212
"choices": "Disabled\nPassword\nSSH Key",
1313
"new_question": true,
14-
"variable": "sftp_auth_method",
14+
"variable": "awx_sftp_auth_method",
1515
"type": "multiplechoice"
1616
},
1717
{
@@ -20,10 +20,10 @@
2020
"required": false,
2121
"min": 0,
2222
"max": 64,
23-
"default": "{{ sftp_password }}",
23+
"default": "{{ awx_sftp_password }}",
2424
"choices": "",
2525
"new_question": true,
26-
"variable": "sftp_password",
26+
"variable": "awx_sftp_password",
2727
"type": "password"
2828
},
2929
{
@@ -32,10 +32,10 @@
3232
"required": false,
3333
"min": 0,
3434
"max": 16384,
35-
"default": "{{ sftp_public_key }}",
35+
"default": "{{ awx_sftp_public_key }}",
3636
"choices": "",
3737
"new_question": true,
38-
"variable": "sftp_public_key",
38+
"variable": "awx_sftp_public_key",
3939
"type": "text"
4040
}
4141
]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"required": false,
99
"min": null,
1010
"max": null,
11-
"default": "{{ matrix_awx_backup_enabled | string | lower }}",
11+
"default": "{{ awx_backup_enabled | string | lower }}",
1212
"choices": "true\nfalse",
1313
"new_question": true,
14-
"variable": "matrix_awx_backup_enabled",
14+
"variable": "awx_backup_enabled",
1515
"type": "multiplechoice"
1616
}
1717
]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"required": true,
2121
"min": null,
2222
"max": null,
23-
"default": "{{ matrix_corporal_policy_provider_mode }}",
23+
"default": "{{ awx_corporal_policy_provider_mode }}",
2424
"choices": "Simple Static File\nHTTP Pull Mode (API Enabled)\nHTTP Push Mode (API Enabled)",
2525
"new_question": true,
26-
"variable": "matrix_corporal_policy_provider_mode",
26+
"variable": "awx_corporal_policy_provider_mode",
2727
"type": "multiplechoice"
2828
},
2929
{
@@ -34,7 +34,7 @@
3434
"max": 65536,
3535
"default": "",
3636
"new_question": true,
37-
"variable": "matrix_corporal_simple_static_config",
37+
"variable": "awx_corporal_simple_static_config",
3838
"type": "textarea"
3939
},
4040
{
@@ -43,9 +43,9 @@
4343
"required": false,
4444
"min": 0,
4545
"max": 4096,
46-
"default": "{{ matrix_corporal_pull_mode_uri }}",
46+
"default": "{{ awx_corporal_pull_mode_uri }}",
4747
"new_question": true,
48-
"variable": "matrix_corporal_pull_mode_uri",
48+
"variable": "awx_corporal_pull_mode_uri",
4949
"type": "text"
5050
},
5151
{
@@ -54,10 +54,10 @@
5454
"required": false,
5555
"min": 0,
5656
"max": 256,
57-
"default": "{{ matrix_corporal_pull_mode_token }}",
57+
"default": "{{ awx_corporal_pull_mode_token }}",
5858
"choices": "",
5959
"new_question": true,
60-
"variable": "matrix_corporal_pull_mode_token",
60+
"variable": "awx_corporal_pull_mode_token",
6161
"type": "password"
6262
},
6363
{
@@ -66,10 +66,10 @@
6666
"required": false,
6767
"min": 0,
6868
"max": 256,
69-
"default": "{{ matrix_corporal_http_api_auth_token }}",
69+
"default": "{{ awx_corporal_http_api_auth_token }}",
7070
"choices": "",
7171
"new_question": true,
72-
"variable": "matrix_corporal_http_api_auth_token",
72+
"variable": "awx_corporal_http_api_auth_token",
7373
"type": "password"
7474
},
7575
{
@@ -78,7 +78,7 @@
7878
"required": false,
7979
"min": null,
8080
"max": null,
81-
"default": "{{ matrix_corporal_raise_ratelimits }}",
81+
"default": "{{ awx_corporal_raise_ratelimits }}",
8282
"choices": "Normal\nRaised",
8383
"new_question": true,
8484
"variable": "matrix_corporal_raise_ratelimits",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"required": false,
2121
"min": 0,
2222
"max": 65536,
23-
"default": {{ ext_dimension_users_raw_final | to_json }},
23+
"default": {{ awx_dimension_users_final | to_json }},
2424
"choices": "",
2525
"new_question": true,
26-
"variable": "ext_dimension_users_raw",
26+
"variable": "awx_dimension_users",
2727
"type": "textarea"
2828
}
2929
]

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

Lines changed: 62 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
"variable": "matrix_client_element_enabled",
1515
"type": "multiplechoice"
1616
},
17-
{
18-
"question_name": "Set Branding for Web Client",
19-
"question_description": "Sets the 'branding' seen in the tab and on the welcome page to a custom value.",
20-
"required": false,
21-
"min": 0,
22-
"max": 256,
23-
"default": "{{ matrix_client_element_brand }}",
24-
"choices": "",
25-
"new_question": true,
26-
"variable": "matrix_client_element_brand",
27-
"type": "text"
28-
},
2917
{
3018
"question_name": "Set Theme for Web Client",
3119
"question_description": "Sets the default theme for the web client, can be changed later by individual users.",
@@ -38,18 +26,78 @@
3826
"variable": "matrix_client_element_default_theme",
3927
"type": "multiplechoice"
4028
},
29+
{
30+
"question_name": "Set Branding for Web Client",
31+
"question_description": "Sets the 'branding' seen in the tab and on the welcome page to a custom value.Leaving this field blank will cause the default branding will be used: 'Element'",
32+
"required": false,
33+
"min": 0,
34+
"max": 256,
35+
"default": "{{ matrix_client_element_brand | trim }}",
36+
"choices": "",
37+
"new_question": true,
38+
"variable": "matrix_client_element_brand",
39+
"type": "text"
40+
},
4141
{
4242
"question_name": "Set Welcome Page Background",
43-
"question_description": "URL to Wallpaper, shown in background of the welcome page. Must be a 'https' link, otherwise it won't be set.",
43+
"question_description": "Sets the background image on the welcome page, you should enter a URL to the image you want to use. Must be a 'https' link, otherwise it won't be set. Leaving this field blank will cause the default background to be used.",
4444
"required": false,
4545
"min": 0,
4646
"max": 1024,
47-
"default": "{{ matrix_client_element_branding_welcomeBackgroundUrl }}",
47+
"default": "{{ matrix_client_element_branding_welcomeBackgroundUrl | trim }}",
4848
"choices": "",
4949
"new_question": true,
5050
"variable": "matrix_client_element_branding_welcomeBackgroundUrl",
5151
"type": "text"
5252
},
53+
{
54+
"question_name": "Set Welcome Page Logo",
55+
"question_description": "Sets the logo found on the welcome and login page, must be a valid https link to your logo, the logo itself should be a square vector image (SVG). Leaving this field blank will cause the default Element logo to be used.",
56+
"required": false,
57+
"min": 0,
58+
"max": 1024,
59+
"default": "{{ matrix_client_element_welcome_logo | trim }}",
60+
"choices": "",
61+
"new_question": true,
62+
"variable": "matrix_client_element_welcome_logo",
63+
"type": "text"
64+
},
65+
{
66+
"question_name": "Set Welcome Page Logo URL",
67+
"question_description": "Sets the URL link the welcome page logo leads to, must be a valid https link. Leaving this field blank will cause this default link to be used: 'https://element.io'",
68+
"required": false,
69+
"min": 0,
70+
"max": 1024,
71+
"default": "{{ matrix_client_element_welcome_logo_link | trim }}",
72+
"choices": "",
73+
"new_question": true,
74+
"variable": "matrix_client_element_welcome_logo_link",
75+
"type": "text"
76+
},
77+
{
78+
"question_name": "Set Welcome Page Headline",
79+
"question_description": "Sets the headline seen on the welcome page. Leaving this field blank will cause this default headline to be used: 'Welcome to Element!'",
80+
"required": false,
81+
"min": 0,
82+
"max": 512,
83+
"default": "{{ awx_matrix_client_element_welcome_headline | trim }}",
84+
"choices": "",
85+
"new_question": true,
86+
"variable": "awx_matrix_client_element_welcome_headline",
87+
"type": "text"
88+
},
89+
{
90+
"question_name": "Set Welcome Page Text",
91+
"question_description": "Sets the text seen on the welcome page. Leaving this field blank will cause this default headline to be used: 'Decentralised, encrypted chat & collaboration powered by [Matrix]'",
92+
"required": false,
93+
"min": 0,
94+
"max": 2048,
95+
"default": "{{ awx_matrix_client_element_welcome_text | trim }}",
96+
"choices": "",
97+
"new_question": true,
98+
"variable": "awx_matrix_client_element_welcome_text",
99+
"type": "text"
100+
},
53101
{
54102
"question_name": "Show Registration Button",
55103
"question_description": "If you show the registration button on the welcome page.",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"required": false,
99
"min": 0,
1010
"max": 2048,
11-
"default": "{{ element_subdomain }}",
11+
"default": "{{ awx_element_subdomain }}",
1212
"choices": "",
1313
"new_question": true,
14-
"variable": "element_subdomain",
14+
"variable": "awx_element_subdomain",
1515
"type": "text"
1616
}
1717
]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"required": false,
2121
"min": null,
2222
"max": null,
23-
"default": "{{ ext_matrix_ma1sd_auth_store }}",
23+
"default": "{{ awx_matrix_ma1sd_auth_store }}",
2424
"choices": "Synapse Internal\nLDAP/AD",
2525
"new_question": true,
26-
"variable": "ext_matrix_ma1sd_auth_store",
26+
"variable": "awx_matrix_ma1sd_auth_store",
2727
"type": "multiplechoice"
2828
},
2929
{
@@ -32,9 +32,9 @@
3232
"required": false,
3333
"min": 0,
3434
"max": 65536,
35-
"default": {{ ext_matrix_ma1sd_configuration_extension_yaml | to_json }},
35+
"default": {{ awx_matrix_ma1sd_configuration_extension_yaml | to_json }},
3636
"new_question": true,
37-
"variable": "ext_matrix_ma1sd_configuration_extension_yaml",
37+
"variable": "awx_matrix_ma1sd_configuration_extension_yaml",
3838
"type": "textarea"
3939
}
4040
]

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
"required": false,
9393
"min": null,
9494
"max": null,
95-
"default": "{{ ext_registrations_require_3pid | string | lower }}",
95+
"default": "{{ awx_registrations_require_3pid | string | lower }}",
9696
"choices": "true\nfalse",
9797
"new_question": true,
98-
"variable": "ext_registrations_require_3pid",
98+
"variable": "awx_registrations_require_3pid",
9999
"type": "multiplechoice"
100100
},
101101
{
@@ -107,7 +107,7 @@
107107
"default": "",
108108
"choices": "",
109109
"new_question": true,
110-
"variable": "ext_matrix_synapse_registration_shared_secret",
110+
"variable": "awx_matrix_synapse_registration_shared_secret",
111111
"type": "password"
112112
},
113113
{
@@ -119,7 +119,7 @@
119119
"default": "{{ matrix_synapse_max_upload_size_mb }}",
120120
"choices": "",
121121
"new_question": true,
122-
"variable": "matrix_synapse_max_upload_size_mb_raw",
122+
"variable": "awx_synapse_max_upload_size_mb",
123123
"type": "text"
124124
},
125125
{
@@ -128,10 +128,10 @@
128128
"required": false,
129129
"min": 0,
130130
"max": 65536,
131-
"default": {{ ext_url_preview_accept_language_default | to_json }},
131+
"default": {{ awx_url_preview_accept_language_default | to_json }},
132132
"choices": "",
133133
"new_question": true,
134-
"variable": "ext_url_preview_accept_language_raw",
134+
"variable": "awx_url_preview_accept_language",
135135
"type": "textarea"
136136
},
137137
{
@@ -140,10 +140,10 @@
140140
"required": false,
141141
"min": 0,
142142
"max": 65536,
143-
"default": {{ ext_federation_whitelist_raw | to_json }},
143+
"default": {{ awx_federation_whitelist | to_json }},
144144
"choices": "",
145145
"new_question": true,
146-
"variable": "ext_federation_whitelist_raw",
146+
"variable": "awx_federation_whitelist",
147147
"type": "textarea"
148148
},
149149
{
@@ -152,10 +152,10 @@
152152
"required": false,
153153
"min": 0,
154154
"max": 65536,
155-
"default": {{ matrix_synapse_auto_join_rooms_raw | to_json }},
155+
"default": {{ awx_synapse_auto_join_rooms | to_json }},
156156
"choices": "",
157157
"new_question": true,
158-
"variable": "matrix_synapse_auto_join_rooms_raw",
158+
"variable": "awx_synapse_auto_join_rooms",
159159
"type": "textarea"
160160
},
161161
{
@@ -164,10 +164,10 @@
164164
"required": false,
165165
"min": null,
166166
"max": null,
167-
"default": "{{ ext_enable_registration_captcha | string | lower }}",
167+
"default": "{{ awx_enable_registration_captcha | string | lower }}",
168168
"choices": "true\nfalse",
169169
"new_question": true,
170-
"variable": "ext_enable_registration_captcha",
170+
"variable": "awx_enable_registration_captcha",
171171
"type": "multiplechoice"
172172
},
173173
{
@@ -176,10 +176,10 @@
176176
"required": false,
177177
"min": 0,
178178
"max": 40,
179-
"default": "{{ ext_recaptcha_public_key }}",
179+
"default": "{{ awx_recaptcha_public_key }}",
180180
"choices": "",
181181
"new_question": true,
182-
"variable": "ext_recaptcha_public_key",
182+
"variable": "awx_recaptcha_public_key",
183183
"type": "text"
184184
},
185185
{
@@ -188,10 +188,10 @@
188188
"required": false,
189189
"min": 0,
190190
"max": 40,
191-
"default": "{{ ext_recaptcha_private_key }}",
191+
"default": "{{ awx_recaptcha_private_key }}",
192192
"choices": "",
193193
"new_question": true,
194-
"variable": "ext_recaptcha_private_key",
194+
"variable": "awx_recaptcha_private_key",
195195
"type": "text"
196196
}
197197
]

0 commit comments

Comments
 (0)