More ansible-lint fixes
This commit is contained in:
@ -5,25 +5,25 @@
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
The matrix-bridge-heisenbridge role needs to execute before the matrix-synapse role.
|
||||
when: "matrix_heisenbridge_enabled and matrix_synapse_role_executed|default(False)"
|
||||
when: "matrix_heisenbridge_enabled and matrix_synapse_role_executed | default(False)"
|
||||
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-heisenbridge.service'] }}"
|
||||
when: matrix_heisenbridge_enabled|bool
|
||||
when: matrix_heisenbridge_enabled | bool
|
||||
|
||||
# If the matrix-synapse role is not used, these variables may not exist.
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_synapse_container_extra_arguments: >
|
||||
{{
|
||||
matrix_synapse_container_extra_arguments|default([])
|
||||
matrix_synapse_container_extra_arguments | default([])
|
||||
+
|
||||
["--mount type=bind,src={{ matrix_heisenbridge_base_path }}/registration.yaml,dst=/heisenbridge-registration.yaml,ro"]
|
||||
}}
|
||||
|
||||
matrix_synapse_app_service_config_files: >
|
||||
{{
|
||||
matrix_synapse_app_service_config_files|default([])
|
||||
matrix_synapse_app_service_config_files | default([])
|
||||
+
|
||||
["/heisenbridge-registration.yaml"]
|
||||
}}
|
||||
when: matrix_heisenbridge_enabled|bool
|
||||
when: matrix_heisenbridge_enabled | bool
|
||||
|
@ -1,17 +1,17 @@
|
||||
---
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
|
||||
when: "run_setup|bool and matrix_heisenbridge_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
|
||||
when: "run_setup | bool and matrix_heisenbridge_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-heisenbridge
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
|
||||
when: "run_setup|bool and not matrix_heisenbridge_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
|
||||
when: "run_setup | bool and not matrix_heisenbridge_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-heisenbridge
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
- name: Ensure heisenbridge registration.yaml installed if provided
|
||||
ansible.builtin.copy:
|
||||
content: "{{ matrix_heisenbridge_registration|to_nice_yaml(indent=2, width=999999) }}"
|
||||
content: "{{ matrix_heisenbridge_registration | to_nice_yaml(indent=2, width=999999) }}"
|
||||
dest: "{{ matrix_heisenbridge_base_path }}/registration.yaml"
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_username }}"
|
||||
|
@ -1,7 +1,7 @@
|
||||
---
|
||||
|
||||
- name: Check existence of matrix-heisenbridge service
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_systemd_path }}/matrix-heisenbridge.service"
|
||||
register: matrix_heisenbridge_service_stat
|
||||
|
||||
|
Reference in New Issue
Block a user