Make the linter happy.

This commit is contained in:
jakicoll 2023-02-06 16:29:25 +01:00
parent f3ca4a0632
commit be634168ac
7 changed files with 12 additions and 9 deletions

View file

@ -54,7 +54,7 @@ matrix_jitsi_ldap_start_tls: false
# Auth type: matrix # Auth type: matrix
matrix_jitsi_prosody_auth_matrix_user_verification_repo_location: "https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification" matrix_jitsi_prosody_auth_matrix_user_verification_repo_location: "https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification"
matrix_jitsi_prosody_auth_matrix_user_verification_repo_target: "{{ matrix_jitsi_prosody_ext_path }}/prosody_auth_matrix_user_verification" matrix_jitsi_prosody_auth_matrix_user_verification_repo_target: "{{ matrix_jitsi_prosody_ext_path }}/prosody_auth_matrix_user_verification"
matrix_jitsi_prosody_auth_matrix_user_verification_repo_version: "2839499cb03894d8cfc3e5b2219441427cb133d8" # v1.8.0 matrix_jitsi_prosody_auth_matrix_user_verification_repo_version: "2839499cb03894d8cfc3e5b2219441427cb133d8" # v1.8.0
matrix_jitsi_prosody_auth_matrix_uvs_sync_power_levels: true matrix_jitsi_prosody_auth_matrix_uvs_sync_power_levels: true
matrix_jitsi_prosody_auth_matrix_uvs_location: "" matrix_jitsi_prosody_auth_matrix_uvs_location: ""
# Should match domain, see https://github.com/vector-im/element-web/pull/15114/commits/0410a6b3be82a41457275e4d1ce879dea146e092 # Should match domain, see https://github.com/vector-im/element-web/pull/15114/commits/0410a6b3be82a41457275e4d1ce879dea146e092

View file

@ -1,3 +1,5 @@
---
- name: Checkout Prosody Auth Matrix User Verification Plugin Repo - name: Checkout Prosody Auth Matrix User Verification Plugin Repo
ansible.builtin.git: ansible.builtin.git:
repo: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_location }}" repo: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_location }}"
@ -6,7 +8,7 @@
- name: Install Prosody Auth Matrix User Verification Plugin - name: Install Prosody Auth Matrix User Verification Plugin
ansible.builtin.copy: ansible.builtin.copy:
remote_src: yes remote_src: true
src: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_target }}/{{ item.path }}" src: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_target }}/{{ item.path }}"
dest: "{{ matrix_jitsi_prosody_plugins_path }}/{{ item.path }}" dest: "{{ matrix_jitsi_prosody_plugins_path }}/{{ item.path }}"
with_items: "{{ matrix_jitsi_prosody_auth_matrix_files }}" with_items: "{{ matrix_jitsi_prosody_auth_matrix_files }}"

View file

@ -1,3 +1,5 @@
---
- name: Remove all files regarding prosody mod auth_matrix_user_verification and .well-known/element/jitsi - name: Remove all files regarding prosody mod auth_matrix_user_verification and .well-known/element/jitsi
ansible.builtin.file: ansible.builtin.file:
path: "{{ item }}" path: "{{ item }}"
@ -11,10 +13,10 @@
- name: Remove .well-known/element directory if empty - name: Remove .well-known/element directory if empty
ansible.builtin.command: ansible.builtin.command:
argv: argv:
- rmdir - rmdir
- "{{ matrix_static_files_base_path }}/.well-known/element" - "{{ matrix_static_files_base_path }}/.well-known/element"
removes: "{{matrix_static_files_base_path}}/.well-known/element" removes: "{{matrix_static_files_base_path}}/.well-known/element"
ignore_errors: yes ignore_errors: true
- when: matrix_jitsi_prosody_auth_matrix_user_verification_uninstalled.changed - when: matrix_jitsi_prosody_auth_matrix_user_verification_uninstalled.changed
block: block:

View file

@ -45,7 +45,6 @@
or (matrix_jitsi_auth_type == 'matrix' and matrix_jitsi_prosody_auth_matrix_uvs_auth_token|length == 0)) or (matrix_jitsi_auth_type == 'matrix' and matrix_jitsi_prosody_auth_matrix_uvs_auth_token|length == 0))
- name: (Deprecation) Catch and report renamed settings - name: (Deprecation) Catch and report renamed settings
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-

View file

@ -2,5 +2,5 @@
- name: Ensure systemd reloaded after matrix-user-verification-service.service installation - name: Ensure systemd reloaded after matrix-user-verification-service.service installation
service: service:
daemon_reload: yes daemon_reload: true
listen: "reload matrix-user-verification-service" listen: "reload matrix-user-verification-service"

View file

@ -8,7 +8,7 @@
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"
with_items: with_items:
- { path: "{{ matrix_user_verification_service_config_path }}", when: true } - {path: "{{ matrix_user_verification_service_config_path }}", when: true}
when: item.when | bool when: item.when | bool
- name: Ensure Matrix User Verification Service image is pulled - name: Ensure Matrix User Verification Service image is pulled

View file

@ -11,7 +11,7 @@
service: service:
name: "{{ matrix_user_verification_service_systemd_service_basename }}" name: "{{ matrix_user_verification_service_systemd_service_basename }}"
state: stopped state: stopped
daemon_reload: yes 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