More ansible-lint fixes
This commit is contained in:
@ -8,4 +8,4 @@
|
||||
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-client-hydrogen.service'] }}"
|
||||
when: matrix_client_hydrogen_enabled|bool
|
||||
when: matrix_client_hydrogen_enabled | bool
|
||||
|
@ -1,30 +1,30 @@
|
||||
---
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
when: "run_setup|bool and matrix_client_hydrogen_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
when: "run_setup | bool and matrix_client_hydrogen_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-client-hydrogen
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
|
||||
when: "run_setup|bool and matrix_client_hydrogen_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
|
||||
when: "run_setup | bool and matrix_client_hydrogen_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-client-hydrogen
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
|
||||
when: "run_setup|bool and not matrix_client_hydrogen_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
|
||||
when: "run_setup | bool and not matrix_client_hydrogen_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-client-hydrogen
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/self_check.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/self_check.yml"
|
||||
delegate_to: 127.0.0.1
|
||||
become: false
|
||||
when: "run_self_check|bool and matrix_client_hydrogen_enabled|bool"
|
||||
when: "run_self_check | bool and matrix_client_hydrogen_enabled | bool"
|
||||
tags:
|
||||
- self-check
|
||||
|
@ -10,7 +10,7 @@
|
||||
with_items:
|
||||
- {path: "{{ matrix_client_hydrogen_data_path }}", when: true}
|
||||
- {path: "{{ matrix_client_hydrogen_docker_src_files_path }}", when: "{{ matrix_client_hydrogen_container_image_self_build }}"}
|
||||
when: "item.when|bool"
|
||||
when: "item.when | bool"
|
||||
|
||||
- name: Ensure Hydrogen Docker image is pulled
|
||||
docker_image:
|
||||
@ -18,7 +18,7 @@
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_client_hydrogen_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
|
||||
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_client_hydrogen_docker_image_force_pull }}"
|
||||
when: "not matrix_client_hydrogen_container_image_self_build|bool"
|
||||
when: "not matrix_client_hydrogen_container_image_self_build | bool"
|
||||
register: result
|
||||
retries: "{{ matrix_container_retries_count }}"
|
||||
delay: "{{ matrix_container_retries_delay }}"
|
||||
@ -33,7 +33,7 @@
|
||||
become: true
|
||||
become_user: "{{ matrix_user_username }}"
|
||||
register: matrix_client_hydrogen_git_pull_results
|
||||
when: "matrix_client_hydrogen_container_image_self_build|bool"
|
||||
when: "matrix_client_hydrogen_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure Hydrogen configuration installed
|
||||
ansible.builtin.copy:
|
||||
@ -42,7 +42,7 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_username }}"
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
when: "matrix_client_hydrogen_container_image_self_build|bool"
|
||||
when: "matrix_client_hydrogen_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure Hydrogen additional config files installed
|
||||
ansible.builtin.template:
|
||||
@ -66,7 +66,7 @@
|
||||
dockerfile: Dockerfile
|
||||
path: "{{ matrix_client_hydrogen_docker_src_files_path }}"
|
||||
pull: true
|
||||
when: "matrix_client_hydrogen_container_image_self_build|bool"
|
||||
when: "matrix_client_hydrogen_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure matrix-client-hydrogen.service installed
|
||||
ansible.builtin.template:
|
||||
@ -78,4 +78,4 @@
|
||||
- name: Ensure systemd reloaded after matrix-client-hydrogen.service installation
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_client_hydrogen_systemd_service_result.changed|bool"
|
||||
when: "matrix_client_hydrogen_systemd_service_result.changed | bool"
|
||||
|
@ -1,7 +1,7 @@
|
||||
---
|
||||
|
||||
- name: Check existence of matrix-client-hydrogen.service
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_systemd_path }}/matrix-client-hydrogen.service"
|
||||
register: matrix_client_hydrogen_service_stat
|
||||
|
||||
@ -12,18 +12,18 @@
|
||||
enabled: false
|
||||
daemon_reload: true
|
||||
register: stopping_result
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists|bool"
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists | bool"
|
||||
|
||||
- name: Ensure matrix-client-hydrogen.service doesn't exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_systemd_path }}/matrix-client-hydrogen.service"
|
||||
state: absent
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists|bool"
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists | bool"
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-client-hydrogen.service removal
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists|bool"
|
||||
when: "matrix_client_hydrogen_service_stat.stat.exists | bool"
|
||||
|
||||
- name: Ensure Hydrogen paths doesn't exist
|
||||
ansible.builtin.file:
|
||||
|
@ -4,6 +4,6 @@
|
||||
ansible.builtin.fail:
|
||||
msg: >
|
||||
You need to define a required configuration setting (`{{ item }}`) to use Hydrogen.
|
||||
when: "(vars[item] == '' or vars[item] is none) and matrix_client_hydrogen_container_image_self_build|bool"
|
||||
when: "(vars[item] == '' or vars[item] is none) and matrix_client_hydrogen_container_image_self_build | bool"
|
||||
with_items:
|
||||
- "matrix_client_hydrogen_default_hs_url"
|
||||
|
Reference in New Issue
Block a user