Просмотр исходного кода

update element section

pull/1326/head
Michael Collins 4 лет назад
Родитель
Сommit
8ff0ae27b8
2 измененных файлов: 20 добавлений и 20 удалений
  1. +8
    -8
      roles/matrix-awx/surveys/configure_element.json.j2
  2. +12
    -12
      roles/matrix-awx/tasks/set_variables_element.yml

+ 8
- 8
roles/matrix-awx/surveys/configure_element.json.j2 Просмотреть файл

@@ -56,10 +56,10 @@
"required": false,
"min": 0,
"max": 1024,
"default": "{{ awx_matrix_client_element_welcome_logo }}",
"default": "{{ matrix_client_element_welcome_logo }}",
"choices": "",
"new_question": true,
"variable": "awx_matrix_client_element_welcome_logo",
"variable": "matrix_client_element_welcome_logo",
"type": "text"
},
{
@@ -68,10 +68,10 @@
"required": false,
"min": 0,
"max": 1024,
"default": "{{ awx_matrix_client_element_welcome_logo_link }}",
"default": "{{ matrix_client_element_welcome_logo_link }}",
"choices": "",
"new_question": true,
"variable": "awx_matrix_client_element_welcome_logo_link",
"variable": "matrix_client_element_welcome_logo_link",
"type": "text"
},
{
@@ -80,10 +80,10 @@
"required": false,
"min": 0,
"max": 512,
"default": "{{ awx_matrix_client_element_welcome_headline }}",
"default": "{{ matrix_client_element_welcome_headline }}",
"choices": "",
"new_question": true,
"variable": "awx_matrix_client_element_welcome_headline",
"variable": "matrix_client_element_welcome_headline",
"type": "text"
},
{
@@ -92,10 +92,10 @@
"required": false,
"min": 0,
"max": 2048,
"default": "{{ awx_matrix_client_element_welcome_text }}",
"default": "{{ matrix_client_element_welcome_text }}",
"choices": "",
"new_question": true,
"variable": "awx_matrix_client_element_welcome_text",
"variable": "matrix_client_element_welcome_text",
"type": "text"
},
{


+ 12
- 12
roles/matrix-awx/tasks/set_variables_element.yml Просмотреть файл

@@ -43,8 +43,8 @@
line: "{{ item.key }}: '{{ item.value }}'"
insertafter: '# Element Settings Start'
with_dict:
'matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
when: ( awx_https_string in awx_matrix_client_element_welcome_logo ) and ( awx_matrix_client_element_welcome_logo | trim | length > 0 )
'matrix_client_element_welcome_logo': '{{ matrix_client_element_welcome_logo }}'
when: ( awx_https_string in matrix_client_element_welcome_logo ) and ( matrix_client_element_welcome_logo | trim | length > 0 )

- name: Remove custom logo locally on AWX if not defined
delegate_to: 127.0.0.1
@@ -52,7 +52,7 @@
path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_logo: "
state: absent
when: awx_matrix_client_element_welcome_logo | trim | length == 0
when: matrix_client_element_welcome_logo | trim | length == 0

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

- name: Remove custom logo link locally on AWX if not defined
delegate_to: 127.0.0.1
@@ -71,7 +71,7 @@
path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_logo_link: "
state: absent
when: awx_matrix_client_element_welcome_logo_link | trim | length == 0
when: matrix_client_element_welcome_logo_link | trim | length == 0

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

- name: Remove custom headline locally on AWX if not defined
delegate_to: 127.0.0.1
@@ -90,7 +90,7 @@
path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_headline: "
state: absent
when: awx_matrix_client_element_welcome_headline | trim | length == 0
when: matrix_client_element_welcome_headline | trim | length == 0

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

- name: Remove custom text locally on AWX if not defined
delegate_to: 127.0.0.1
@@ -109,7 +109,7 @@
path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_text: "
state: absent
when: awx_matrix_client_element_welcome_text | trim | length == 0
when: matrix_client_element_welcome_text | trim | length == 0

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


Загрузка…
Отмена
Сохранить