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

update

Browse Source
This commit is contained in:
Michael Collins 2021-10-10 16:16:31 +08:00
parent a631587ebd
commit 89c8ae94d6
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-awx/tasks/backup_server.yml
View File

@ -93,8 +93,8 @@
- name: Set boolean value to exit playbook - name: Set boolean value to exit playbook
set_fact: set_fact:
end_playbook: true awx_end_playbook: true
- name: End playbook if this task list is called. - name: End playbook if this task list is called.
meta: end_play meta: end_play
when: end_playbook is defined and end_playbook|bool when: awx_end_playbook is defined and awx_end_playbook|bool

4
roles/matrix-awx/tasks/set_variables_dimension.yml
View File

@ -31,12 +31,12 @@
- name: Set final users list if users are defined - name: Set final users list if users are defined
set_fact: set_fact:
awx_dimension_users_final: "{{ awx_dimension_users }}" awx_dimension_users_final: "{{ awx_dimension_users }}"
when: awx_dimension_users|length > 0 when: awx_dimension_users | length > 0
- name: Set final users list if no users are defined - name: Set final users list if no users are defined
set_fact: set_fact:
awx_dimension_users_final: '@dimension:{{ matrix_domain }}' awx_dimension_users_final: '@dimension:{{ matrix_domain }}'
when: awx_dimension_users|length == 0 when: awx_dimension_users | length == 0
- name: Remove Dimension Users - name: Remove Dimension Users
delegate_to: 127.0.0.1 delegate_to: 127.0.0.1

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

@ -23,10 +23,10 @@
lineinfile: lineinfile:
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^#? *{{ item.key | regex_escape() }}:" regexp: "^#? *{{ item.key | regex_escape() }}:"
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': '{{ awx_matrix_client_element_welcome_logo }}' '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 ) 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
@ -42,10 +42,10 @@
lineinfile: lineinfile:
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^#? *{{ item.key | regex_escape() }}:" regexp: "^#? *{{ item.key | regex_escape() }}:"
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': '{{ awx_matrix_client_element_welcome_logo_link }}' '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 ) 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
@ -61,10 +61,10 @@
lineinfile: lineinfile:
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^#? *{{ item.key | regex_escape() }}:" regexp: "^#? *{{ item.key | regex_escape() }}:"
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': '{{ awx_matrix_client_element_welcome_headline }}' 'matrix_client_element_welcome_headline': "'{{ awx_matrix_client_element_welcome_headline }}'"
when: awx_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
@ -80,10 +80,10 @@
lineinfile: lineinfile:
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^#? *{{ item.key | regex_escape() }}:" regexp: "^#? *{{ item.key | regex_escape() }}:"
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': '{{ awx_matrix_client_element_welcome_text }}' 'matrix_client_element_welcome_text': "'{{ awx_matrix_client_element_welcome_text }}'"
when: awx_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
@ -99,10 +99,10 @@
lineinfile: lineinfile:
path: '{{ awx_cached_matrix_vars }}' path: '{{ awx_cached_matrix_vars }}'
regexp: "^#? *{{ item.key | regex_escape() }}:" regexp: "^#? *{{ item.key | regex_escape() }}:"
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_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl }}' 'matrix_client_element_branding_welcomeBackgroundUrl': "'{{ matrix_client_element_branding_welcomeBackgroundUrl }}'"
when: ( awx_https_string in matrix_client_element_branding_welcomeBackgroundUrl ) and ( matrix_client_element_branding_welcomeBackgroundUrl | length > 0 ) when: ( awx_https_string in matrix_client_element_branding_welcomeBackgroundUrl ) and ( matrix_client_element_branding_welcomeBackgroundUrl | length > 0 )
- name: Save new 'Configure Element' survey.json to the AWX tower, template - name: Save new 'Configure Element' survey.json to the AWX tower, template