mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2025-06-25 18:57:50 +02:00
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-corporal.service'] }}"
|
||||
when: matrix_corporal_enabled|bool
|
||||
when: matrix_corporal_enabled | bool
|
||||
|
@ -1,24 +1,24 @@
|
||||
---
|
||||
|
||||
- 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_corporal_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
when: "run_setup | bool and matrix_corporal_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-corporal
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_corporal.yml"
|
||||
when: run_setup|bool
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_corporal.yml"
|
||||
when: run_setup | bool
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-corporal
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/self_check_corporal.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/self_check_corporal.yml"
|
||||
delegate_to: 127.0.0.1
|
||||
become: false
|
||||
when: "run_self_check|bool and matrix_corporal_enabled|bool"
|
||||
when: "run_self_check | bool and matrix_corporal_enabled | bool"
|
||||
tags:
|
||||
- self-check
|
||||
|
@ -15,7 +15,7 @@
|
||||
- "{{ matrix_corporal_config_dir_path }}"
|
||||
- "{{ matrix_corporal_cache_dir_path }}"
|
||||
- "{{ matrix_corporal_var_dir_path }}"
|
||||
when: matrix_corporal_enabled|bool
|
||||
when: matrix_corporal_enabled | bool
|
||||
|
||||
- name: Ensure Matrix Corporal repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
@ -26,7 +26,7 @@
|
||||
become: true
|
||||
become_user: "{{ matrix_user_username }}"
|
||||
register: matrix_corporal_git_pull_results
|
||||
when: "matrix_corporal_enabled|bool and matrix_corporal_container_image_self_build|bool"
|
||||
when: "matrix_corporal_enabled | bool and matrix_corporal_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure Matrix Corporal Docker image is built
|
||||
docker_image:
|
||||
@ -38,7 +38,7 @@
|
||||
dockerfile: etc/docker/Dockerfile
|
||||
path: "{{ matrix_corporal_container_src_files_path }}"
|
||||
pull: true
|
||||
when: "matrix_corporal_enabled|bool and matrix_corporal_container_image_self_build|bool"
|
||||
when: "matrix_corporal_enabled | bool and matrix_corporal_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure Matrix Corporal Docker image is pulled
|
||||
docker_image:
|
||||
@ -46,7 +46,7 @@
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_corporal_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_corporal_docker_image_force_pull }}"
|
||||
when: "matrix_corporal_enabled|bool and not matrix_corporal_container_image_self_build|bool"
|
||||
when: "matrix_corporal_enabled | bool and not matrix_corporal_container_image_self_build | bool"
|
||||
register: result
|
||||
retries: "{{ matrix_container_retries_count }}"
|
||||
delay: "{{ matrix_container_retries_delay }}"
|
||||
@ -59,7 +59,7 @@
|
||||
mode: 0644
|
||||
owner: "{{ matrix_user_username }}"
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
when: matrix_corporal_enabled|bool
|
||||
when: matrix_corporal_enabled | bool
|
||||
|
||||
- name: Ensure matrix-corporal.service installed
|
||||
ansible.builtin.template:
|
||||
@ -67,12 +67,12 @@
|
||||
dest: "{{ matrix_systemd_path }}/matrix-corporal.service"
|
||||
mode: 0644
|
||||
register: matrix_corporal_systemd_service_result
|
||||
when: matrix_corporal_enabled|bool
|
||||
when: matrix_corporal_enabled | bool
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-corporal.service installation
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_corporal_enabled|bool and matrix_corporal_systemd_service_result.changed"
|
||||
when: "matrix_corporal_enabled | bool and matrix_corporal_systemd_service_result.changed"
|
||||
|
||||
|
||||
#
|
||||
@ -80,10 +80,10 @@
|
||||
#
|
||||
|
||||
- name: Check existence of matrix-corporal service
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_systemd_path }}/matrix-corporal.service"
|
||||
register: matrix_corporal_service_stat
|
||||
when: "not matrix_corporal_enabled|bool"
|
||||
when: "not matrix_corporal_enabled | bool"
|
||||
|
||||
- name: Ensure matrix-corporal is stopped
|
||||
ansible.builtin.service:
|
||||
@ -92,18 +92,18 @@
|
||||
enabled: false
|
||||
daemon_reload: true
|
||||
register: stopping_result
|
||||
when: "not matrix_corporal_enabled|bool and matrix_corporal_service_stat.stat.exists"
|
||||
when: "not matrix_corporal_enabled | bool and matrix_corporal_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure matrix-corporal.service doesn't exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_systemd_path }}/matrix-corporal.service"
|
||||
state: absent
|
||||
when: "not matrix_corporal_enabled|bool and matrix_corporal_service_stat.stat.exists"
|
||||
when: "not matrix_corporal_enabled | bool and matrix_corporal_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-corporal.service removal
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "not matrix_corporal_enabled|bool and matrix_corporal_service_stat.stat.exists"
|
||||
when: "not matrix_corporal_enabled | bool and matrix_corporal_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure matrix-corporal files don't exist
|
||||
ansible.builtin.file:
|
||||
@ -112,10 +112,10 @@
|
||||
with_items:
|
||||
- "{{ matrix_systemd_path }}/matrix-corporal.service"
|
||||
- "{{ matrix_corporal_config_dir_path }}/config.json"
|
||||
when: "not matrix_corporal_enabled|bool"
|
||||
when: "not matrix_corporal_enabled | bool"
|
||||
|
||||
- name: Ensure Matrix Corporal Docker image doesn't exist
|
||||
docker_image:
|
||||
name: "{{ matrix_corporal_docker_image }}"
|
||||
state: absent
|
||||
when: "not matrix_corporal_enabled|bool"
|
||||
when: "not matrix_corporal_enabled | bool"
|
||||
|
@ -14,7 +14,7 @@
|
||||
- name: Fail if HTTP API enabled, but no token set
|
||||
ansible.builtin.fail:
|
||||
msg: "The Matrix Corporal HTTP API is enabled (`matrix_corporal_http_api_enabled`), but no auth token has been set in `matrix_corporal_http_api_auth_token`"
|
||||
when: "matrix_corporal_http_api_enabled|bool and matrix_corporal_http_api_auth_token == ''"
|
||||
when: "matrix_corporal_http_api_enabled | bool and matrix_corporal_http_api_auth_token == ''"
|
||||
|
||||
- name: (Deprecation) Catch and report renamed corporal variables
|
||||
ansible.builtin.fail:
|
||||
|
Reference in New Issue
Block a user