finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update naming scheme 1

Browse Source
This commit is contained in:
Michael Collins 2021-10-09 10:21:27 +08:00
parent df9da052ab
commit 42af090a7c
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
roles/matrix-awx/surveys/configure_element.json.j2
View File

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

32
roles/matrix-awx/tasks/set_variables_element.yml
View File

@ -21,10 +21,10 @@
line: "{{ item.key }}: {{ item.value }}" line: "{{ item.key }}: {{ item.value }}"
insertbefore: '# Custom Settings Start' insertbefore: '# Custom Settings Start'
with_dict: with_dict:
'ext_matrix_client_element_welcome_logo': '{{ ext_matrix_client_element_welcome_logo }}' 'awx_matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
'ext_matrix_client_element_welcome_logo_link': '{{ ext_matrix_client_element_welcome_logo_link }}' 'awx_matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}'
'ext_matrix_client_element_welcome_headline': '{{ ext_matrix_client_element_welcome_headline }}' 'awx_matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}'
'ext_matrix_client_element_welcome_text': '{{ ext_matrix_client_element_welcome_text }}' 'awx_matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}'
- name: Set fact for 'https' string - name: Set fact for 'https' string
set_fact: set_fact:
@ -38,8 +38,8 @@
line: "{{ item.key }}: {{ item.value }}" line: "{{ item.key }}: {{ item.value }}"
insertafter: '# Element Settings Start' insertafter: '# Element Settings Start'
with_dict: with_dict:
'matrix_client_element_welcome_logo': '{{ ext_matrix_client_element_welcome_logo }}' 'matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}'
when: ( awx_https_string in ext_matrix_client_element_welcome_logo ) and ( ext_matrix_client_element_welcome_logo|trim|length > 0 ) when: ( awx_https_string in awx_matrix_client_element_welcome_logo ) and ( awx_matrix_client_element_welcome_logo|trim|length > 0 )
- name: Remove custom logo locally on AWX if not defined - name: Remove custom logo locally on AWX if not defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -47,7 +47,7 @@
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_logo: " regexp: "^matrix_client_element_welcome_logo: "
state: absent state: absent
when: ext_matrix_client_element_welcome_logo|trim|length == 0 when: awx_matrix_client_element_welcome_logo|trim|length == 0
- name: Set custom logo link locally on AWX if defined - name: Set custom logo link locally on AWX if defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -57,8 +57,8 @@
line: "{{ item.key }}: {{ item.value }}" line: "{{ item.key }}: {{ item.value }}"
insertafter: '# Element Settings Start' insertafter: '# Element Settings Start'
with_dict: with_dict:
'matrix_client_element_welcome_logo_link': '{{ ext_matrix_client_element_welcome_logo_link }}' 'matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}'
when: ( awx_https_string in ext_matrix_client_element_welcome_logo_link ) and ( ext_matrix_client_element_welcome_logo_link|trim|length > 0 ) when: ( awx_https_string in awx_matrix_client_element_welcome_logo_link ) and ( awx_matrix_client_element_welcome_logo_link|trim|length > 0 )
- name: Remove custom logo link locally on AWX if not defined - name: Remove custom logo link locally on AWX if not defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -66,7 +66,7 @@
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_logo_link: " regexp: "^matrix_client_element_welcome_logo_link: "
state: absent state: absent
when: ext_matrix_client_element_welcome_logo_link|trim|length == 0 when: awx_matrix_client_element_welcome_logo_link|trim|length == 0
- name: Set custom headline locally on AWX if defined - name: Set custom headline locally on AWX if defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -76,8 +76,8 @@
line: "{{ item.key }}: {{ item.value }}" line: "{{ item.key }}: {{ item.value }}"
insertafter: '# Element Settings Start' insertafter: '# Element Settings Start'
with_dict: with_dict:
'matrix_client_element_welcome_headline': '{{ ext_matrix_client_element_welcome_headline }}' 'matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}'
when: ext_matrix_client_element_welcome_headline|trim|length > 0 when: awx_matrix_client_element_welcome_headline|trim|length > 0
- name: Remove custom headline locally on AWX if not defined - name: Remove custom headline locally on AWX if not defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -85,7 +85,7 @@
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_headline: " regexp: "^matrix_client_element_welcome_headline: "
state: absent state: absent
when: ext_matrix_client_element_welcome_headline|trim|length == 0 when: awx_matrix_client_element_welcome_headline|trim|length == 0
- name: Set custom text locally on AWX if defined - name: Set custom text locally on AWX if defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -95,8 +95,8 @@
line: "{{ item.key }}: {{ item.value }}" line: "{{ item.key }}: {{ item.value }}"
insertafter: '# Element Settings Start' insertafter: '# Element Settings Start'
with_dict: with_dict:
'matrix_client_element_welcome_text': '{{ ext_matrix_client_element_welcome_text }}' 'matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}'
when: ext_matrix_client_element_welcome_text|trim|length > 0 when: awx_matrix_client_element_welcome_text|trim|length > 0
- name: Remove custom text locally on AWX if not defined - name: Remove custom text locally on AWX if not defined
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1
@ -104,7 +104,7 @@
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^matrix_client_element_welcome_text: " regexp: "^matrix_client_element_welcome_text: "
state: absent state: absent
when: ext_matrix_client_element_welcome_text|trim|length == 0 when: awx_matrix_client_element_welcome_text|trim|length == 0
- name: Record Element-Web Background variable locally on AWX - name: Record Element-Web Background variable locally on AWX
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1