More ansible-lint fixes

This commit is contained in:
Slavi Pantaleev
2022-07-18 11:22:05 +03:00
parent 34cdaade08
commit ddf18eadc7
337 changed files with 1720 additions and 1720 deletions

View File

@ -2,9 +2,9 @@
- ansible.builtin.set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service'] }}"
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Fail if on an unsupported architecture
ansible.builtin.fail:
msg: "Jitsi only supports the amd64 architecture right now. See https://github.com/jitsi/docker-jitsi-meet/issues/1069 and https://github.com/jitsi/docker-jitsi-meet/issues/1214"
when: matrix_jitsi_enabled|bool and matrix_architecture not in ['amd64', 'arm64']
when: matrix_jitsi_enabled | bool and matrix_architecture not in ['amd64', 'arm64']

View File

@ -1,41 +1,41 @@
---
- 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_jitsi_enabled|bool"
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
when: "run_setup | bool and matrix_jitsi_enabled | bool"
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_base.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_base.yml"
when: run_setup | bool
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_web.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_web.yml"
when: run_setup | bool
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_prosody.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_prosody.yml"
when: run_setup | bool
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_jicofo.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_jicofo.yml"
when: run_setup | bool
tags:
- setup-all
- setup-jitsi
- import_tasks: "{{ role_path }}/tasks/setup_jitsi_jvb.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_jvb.yml"
when: run_setup | bool
tags:
- setup-all
- setup-jitsi

View File

@ -1,6 +1,6 @@
---
- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
- ansible.builtin.import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
#
# Tasks related to setting up jitsi
@ -15,7 +15,7 @@
group: "{{ matrix_user_groupname }}"
with_items:
- {path: "{{ matrix_jitsi_base_path }}", when: true}
when: matrix_jitsi_enabled|bool and item.when
when: matrix_jitsi_enabled | bool and item.when
#
# Tasks related to getting rid of jitsi (if it was previously enabled)

View File

@ -14,7 +14,7 @@
with_items:
- {path: "{{ matrix_jitsi_jicofo_base_path }}", when: true}
- {path: "{{ matrix_jitsi_jicofo_config_path }}", when: true}
when: matrix_jitsi_enabled|bool and item.when
when: matrix_jitsi_enabled | bool and item.when
- name: Ensure jitsi-jicofo Docker image is pulled
docker_image:
@ -22,7 +22,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_jitsi_jicofo_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_jitsi_jicofo_docker_image_force_pull }}"
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -35,7 +35,7 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
mode: 0640
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure jitsi-jicofo configuration files created
ansible.builtin.template:
@ -47,7 +47,7 @@
with_items:
- sip-communicator.properties
- logging.properties
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure matrix-jitsi-jicofo.service installed
ansible.builtin.template:
@ -55,7 +55,7 @@
dest: "{{ matrix_systemd_path }}/matrix-jitsi-jicofo.service"
mode: 0644
register: matrix_jitsi_jicofo_systemd_service_result
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure systemd reloaded after matrix-jitsi-jicofo.service installation
ansible.builtin.service:
@ -67,10 +67,10 @@
#
- name: Check existence of matrix-jitsi-jicofo service
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jicofo.service"
register: matrix_jitsi_jicofo_service_stat
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
- name: Ensure matrix-jitsi-jicofo is stopped
ansible.builtin.service:
@ -79,24 +79,24 @@
enabled: false
daemon_reload: true
register: stopping_result
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jicofo_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jicofo_service_stat.stat.exists"
- name: Ensure matrix-jitsi-jicofo.service doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jicofo.service"
state: absent
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jicofo_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jicofo_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-jitsi-jicofo.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jicofo_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jicofo_service_stat.stat.exists"
- name: Ensure Matrix jitsi-jicofo paths doesn't exist
ansible.builtin.file:
path: "{{ matrix_jitsi_jicofo_base_path }}"
state: absent
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
# Intentionally not removing the Docker image when uninstalling.
# We can't be sure it had been pulled by us in the first place.

View File

@ -14,7 +14,7 @@
with_items:
- {path: "{{ matrix_jitsi_jvb_base_path }}", when: true}
- {path: "{{ matrix_jitsi_jvb_config_path }}", when: true}
when: matrix_jitsi_enabled|bool and item.when
when: matrix_jitsi_enabled | bool and item.when
- name: Ensure jitsi-jvb Docker image is pulled
docker_image:
@ -22,7 +22,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_jitsi_jvb_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_jitsi_jvb_docker_image_force_pull }}"
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -38,7 +38,7 @@
with_items:
- custom-sip-communicator.properties
- logging.properties
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure jitsi-jvb environment variables file created
ansible.builtin.template:
@ -47,7 +47,7 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
mode: 0640
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure matrix-jitsi-jvb.service installed
ansible.builtin.template:
@ -55,7 +55,7 @@
dest: "{{ matrix_systemd_path }}/matrix-jitsi-jvb.service"
mode: 0644
register: matrix_jitsi_jvb_systemd_service_result
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure systemd reloaded after matrix-jitsi-jvb.service installation
ansible.builtin.service:
@ -67,10 +67,10 @@
#
- name: Check existence of matrix-jitsi-jvb service
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jvb.service"
register: matrix_jitsi_jvb_service_stat
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
- name: Ensure matrix-jitsi-jvb is stopped
ansible.builtin.service:
@ -79,24 +79,24 @@
enabled: false
daemon_reload: true
register: stopping_result
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jvb_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jvb_service_stat.stat.exists"
- name: Ensure matrix-jitsi-jvb.service doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-jitsi-jvb.service"
state: absent
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jvb_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jvb_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-jitsi-jvb.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jvb_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_jvb_service_stat.stat.exists"
- name: Ensure Matrix jitsi-jvb paths doesn't exist
ansible.builtin.file:
path: "{{ matrix_jitsi_jvb_base_path }}"
state: absent
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
# Intentionally not removing the Docker image when uninstalling.
# We can't be sure it had been pulled by us in the first place.

View File

@ -15,7 +15,7 @@
- {path: "{{ matrix_jitsi_prosody_base_path }}", when: true}
- {path: "{{ matrix_jitsi_prosody_config_path }}", when: true}
- {path: "{{ matrix_jitsi_prosody_plugins_path }}", when: true}
when: matrix_jitsi_enabled|bool and item.when
when: matrix_jitsi_enabled | bool and item.when
- name: Ensure jitsi-prosody Docker image is pulled
docker_image:
@ -23,7 +23,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_jitsi_prosody_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_jitsi_prosody_docker_image_force_pull }}"
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -36,7 +36,7 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
mode: 0640
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure matrix-jitsi-prosody.service file is installed
ansible.builtin.template:
@ -44,7 +44,7 @@
dest: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
mode: 0644
register: matrix_jitsi_prosody_systemd_service_result
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure systemd service is reloaded after matrix-jitsi-prosody.service installation
ansible.builtin.service:
@ -52,11 +52,11 @@
when: "matrix_jitsi_enabled and matrix_jitsi_prosody_systemd_service_result.changed"
- name: Ensure authentication is properly configured
include_tasks:
ansible.builtin.include_tasks:
ansible.builtin.file: "{{ role_path }}/tasks/util/setup_jitsi_auth.yml"
when:
- matrix_jitsi_enabled|bool
- matrix_jitsi_enable_auth|bool
- matrix_jitsi_enabled | bool
- matrix_jitsi_enable_auth | bool
#
@ -64,10 +64,10 @@
#
- name: Ensure matrix-jitsi-prosody.service file exists
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
register: matrix_jitsi_prosody_service_stat
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
- name: Ensure matrix-jitsi-prosody is stopped
ansible.builtin.service:
@ -76,24 +76,24 @@
enabled: false
daemon_reload: true
register: stopping_result
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_prosody_service_stat.stat.exists"
- name: Ensure matrix-jitsi-prosody.service file doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-jitsi-prosody.service"
state: absent
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_prosody_service_stat.stat.exists"
- name: Ensure systemd is reloaded after matrix-jitsi-prosody.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_prosody_service_stat.stat.exists"
- name: Ensure Matrix jitsi-prosody paths doesn't exist
ansible.builtin.file:
path: "{{ matrix_jitsi_prosody_base_path }}"
state: absent
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
# Intentionally not removing the Docker image when uninstalling.
# We can't be sure it had been pulled by us in the first place.

View File

@ -16,7 +16,7 @@
- {path: "{{ matrix_jitsi_web_config_path }}", when: true}
- {path: "{{ matrix_jitsi_web_transcripts_path }}", when: true}
- {path: "{{ matrix_jitsi_web_crontabs_path }}", when: true}
when: matrix_jitsi_enabled|bool and item.when
when: matrix_jitsi_enabled | bool and item.when
- name: Ensure jitsi-web Docker image is pulled
docker_image:
@ -24,7 +24,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_jitsi_web_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_jitsi_web_docker_image_force_pull }}"
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -37,7 +37,7 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
mode: 0640
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure jitsi-web configuration files created
ansible.builtin.template:
@ -49,7 +49,7 @@
with_items:
- custom-config.js
- custom-interface_config.js
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure matrix-jitsi-web.service installed
ansible.builtin.template:
@ -57,7 +57,7 @@
dest: "{{ matrix_systemd_path }}/matrix-jitsi-web.service"
mode: 0644
register: matrix_jitsi_web_systemd_service_result
when: matrix_jitsi_enabled|bool
when: matrix_jitsi_enabled | bool
- name: Ensure systemd reloaded after matrix-jitsi-web.service installation
ansible.builtin.service:
@ -69,10 +69,10 @@
#
- name: Check existence of matrix-jitsi-web service
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-jitsi-web.service"
register: matrix_jitsi_web_service_stat
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
- name: Ensure matrix-jitsi-web is stopped
ansible.builtin.service:
@ -81,24 +81,24 @@
enabled: false
daemon_reload: true
register: stopping_result
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_web_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_web_service_stat.stat.exists"
- name: Ensure matrix-jitsi-web.service doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-jitsi-web.service"
state: absent
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_web_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_web_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-jitsi-web.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_jitsi_enabled|bool and matrix_jitsi_web_service_stat.stat.exists"
when: "not matrix_jitsi_enabled | bool and matrix_jitsi_web_service_stat.stat.exists"
- name: Ensure Matrix jitsi-web paths doesn't exist
ansible.builtin.file:
path: "{{ matrix_jitsi_web_base_path }}"
state: absent
when: "not matrix_jitsi_enabled|bool"
when: "not matrix_jitsi_enabled | bool"
# Intentionally not removing the Docker image when uninstalling.
# We can't be sure it had been pulled by us in the first place.

View File

@ -36,4 +36,4 @@
ansible.builtin.systemd:
state: stopped
name: matrix-jitsi-prosody
when: matrix_jitsi_prosody_start_result.changed|bool
when: matrix_jitsi_prosody_start_result.changed | bool

View File

@ -27,7 +27,7 @@
If you're setting up Jitsi for the first time, you may have missed a step.
Refer to our setup instructions (docs/configuring-playbook-jitsi.md).
when:
- matrix_jitsi_enable_auth|bool
- matrix_jitsi_enable_auth | bool
- matrix_jitsi_auth_type == 'internal'
- matrix_jitsi_prosody_auth_internal_accounts|length == 0