Fix ansible-lint-reported errors

This commit is contained in:
Slavi Pantaleev 2023-02-10 14:21:31 +02:00
parent 43a6a035a0
commit e1bfa2a7d6
6 changed files with 13 additions and 12 deletions

View File

@ -48,6 +48,7 @@
- "--quiet" - "--quiet"
- "{{ matrix_jitsi_prosody_self_check_uvs_health_url | quote }}" - "{{ matrix_jitsi_prosody_self_check_uvs_health_url | quote }}"
register: matrix_jitsi_prosody_self_check_uvs_result register: matrix_jitsi_prosody_self_check_uvs_result
changed_when: false
ignore_errors: true ignore_errors: true
- name: Fail if user verification service is not (reachable and healthy) - name: Fail if user verification service is not (reachable and healthy)

View File

@ -16,5 +16,5 @@
ansible.builtin.service_facts: ansible.builtin.service_facts:
- name: Ensure prosody is restarted later on if currently running - name: Ensure prosody is restarted later on if currently running
set_fact: ansible.builtin.set_fact:
matrix_jitsi_prosody_require_restart: "{{ true if ansible_facts.services['matrix-jitsi-prosody.service']['state'] == 'running' else false }}" matrix_jitsi_prosody_require_restart: "{{ true if ansible_facts.services['matrix-jitsi-prosody.service']['state'] == 'running' else false }}"

View File

@ -16,13 +16,13 @@
- name: Ensure matrix-jitsi-prosody container is running - name: Ensure matrix-jitsi-prosody container is running
ansible.builtin.systemd: ansible.builtin.systemd:
state: "{{ 'restarted' if matrix_jitsi_prosody_require_restart | d(false) | bool else 'started' }}" state: "{{ 'restarted' if matrix_jitsi_prosody_require_restart | default(false) | bool else 'started' }}"
name: matrix-jitsi-prosody name: matrix-jitsi-prosody
register: matrix_jitsi_prosody_start_result register: matrix_jitsi_prosody_start_result
# If the flag was set, we can safely disable now. # If the flag was set, we can safely disable now.
- name: Disable require restart flag - name: Disable require restart flag
set_fact: ansible.builtin.set_fact:
matrix_jitsi_prosody_require_restart: false matrix_jitsi_prosody_require_restart: false
# #

View File

@ -1,6 +1,6 @@
--- ---
- name: Ensure systemd reloaded after matrix-user-verification-service.service installation - name: Ensure systemd reloaded after matrix-user-verification-service.service installation
service: ansible.builtin.service:
daemon_reload: true daemon_reload: true
listen: "reload matrix-user-verification-service" listen: "reload matrix-user-verification-service"

View File

@ -1,25 +1,25 @@
--- ---
- name: Check existence of matrix-user-verification-service service - name: Check existence of matrix-user-verification-service service
stat: ansible.builtin.stat:
path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}" path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
register: matrix_user_verification_service_service_stat register: matrix_user_verification_service_service_stat
- when: matrix_user_verification_service_service_stat.stat.exists | bool - when: matrix_user_verification_service_service_stat.stat.exists | bool
block: block:
- name: Ensure matrix-user-verification-service is stopped - name: Ensure matrix-user-verification-service is stopped
service: ansible.builtin.service:
name: "{{ matrix_user_verification_service_systemd_service_basename }}" name: "{{ matrix_user_verification_service_systemd_service_basename }}"
state: stopped state: stopped
daemon_reload: true daemon_reload: true
register: stopping_result register: stopping_result
- name: Ensure matrix-user-verification-service.service doesn't exist - name: Ensure matrix-user-verification-service.service doesn't exist
file: ansible.builtin.file:
path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}" path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
state: absent state: absent
- name: Ensure Matrix user-verification-service paths don't exist - name: Ensure Matrix user-verification-service paths don't exist
file: ansible.builtin.file:
path: "{{ matrix_user_verification_service_base_path }}" path: "{{ matrix_user_verification_service_base_path }}"
state: absent state: absent

View File

@ -1,25 +1,25 @@
--- ---
- name: Verify homeserver_url is not empty - name: Verify homeserver_url is not empty
assert: ansible.builtin.assert:
that: that:
- matrix_user_verification_service_uvs_homeserver_url|length > 0 - matrix_user_verification_service_uvs_homeserver_url|length > 0
fail_msg: "Missing variable in {{ matrix_user_verification_service_ansible_name }} role" fail_msg: "Missing variable in {{ matrix_user_verification_service_ansible_name }} role"
- name: Verify Auth is configured properly or disabled - name: Verify Auth is configured properly or disabled
assert: ansible.builtin.assert:
that: that:
- matrix_user_verification_service_uvs_access_token|length > 0 or not matrix_user_verification_service_uvs_require_auth|bool - matrix_user_verification_service_uvs_access_token|length > 0 or not matrix_user_verification_service_uvs_require_auth|bool
fail_msg: "If Auth is enabled, a valid (non empty) TOKEN must be given in 'matrix_user_verification_service_uvs_access_token'." fail_msg: "If Auth is enabled, a valid (non empty) TOKEN must be given in 'matrix_user_verification_service_uvs_access_token'."
- name: Verify server_name for openid verification is given, if pinning a single server_name is enabled. - name: Verify server_name for openid verification is given, if pinning a single server_name is enabled.
assert: ansible.builtin.assert:
that: that:
- matrix_user_verification_service_uvs_openid_verify_server_name|length > 0 or not matrix_user_verification_service_uvs_pin_openid_verify_server_name|bool - matrix_user_verification_service_uvs_openid_verify_server_name|length > 0 or not matrix_user_verification_service_uvs_pin_openid_verify_server_name|bool
fail_msg: "If pinning a single server_name is enabled, a valid (non empty) server_name must be given in 'matrix_user_verification_service_uvs_openid_verify_server_name'." fail_msg: "If pinning a single server_name is enabled, a valid (non empty) server_name must be given in 'matrix_user_verification_service_uvs_openid_verify_server_name'."
- name: Verify the homeserver implementation is synapse - name: Verify the homeserver implementation is synapse
assert: ansible.builtin.assert:
that: that:
- matrix_homeserver_implementation == 'synapse' - matrix_homeserver_implementation == 'synapse'
fail_msg: "The User-Verification-Service requires Synapse as homeserver implementation" fail_msg: "The User-Verification-Service requires Synapse as homeserver implementation"