fix: all praise the allmighty yamllinter
This commit is contained in:
		| @@ -1,3 +1,5 @@ | ||||
| --- | ||||
|  | ||||
| - 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 | ||||
|   | ||||
| @@ -1,3 +1,5 @@ | ||||
| --- | ||||
|  | ||||
| - import_tasks: "{{ role_path }}/tasks/init.yml" | ||||
|   tags: | ||||
|     - always | ||||
|   | ||||
| @@ -14,7 +14,7 @@ | ||||
|     owner: "{{ matrix_user_username }}" | ||||
|     group: "{{ matrix_user_groupname }}" | ||||
|   with_items: | ||||
|     - { path: "{{ matrix_jitsi_base_path }}", when: true } | ||||
|     - {path: "{{ matrix_jitsi_base_path }}", when: true} | ||||
|   when: matrix_jitsi_enabled|bool and item.when | ||||
|  | ||||
| # | ||||
|   | ||||
| @@ -12,8 +12,8 @@ | ||||
|     owner: "{{ matrix_user_username }}" | ||||
|     group: "{{ matrix_user_groupname }}" | ||||
|   with_items: | ||||
|     - { path: "{{ matrix_jitsi_jicofo_base_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_jicofo_config_path }}", when: true } | ||||
|     - {path: "{{ matrix_jitsi_jicofo_base_path }}", when: true} | ||||
|     - {path: "{{ matrix_jitsi_jicofo_config_path }}", when: true} | ||||
|   when: matrix_jitsi_enabled|bool and item.when | ||||
|  | ||||
| - name: Ensure jitsi-jicofo Docker image is pulled | ||||
| @@ -51,7 +51,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-jicofo.service installation | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "matrix_jitsi_enabled and matrix_jitsi_jicofo_systemd_service_result.changed" | ||||
|  | ||||
| # | ||||
| @@ -68,8 +68,8 @@ | ||||
|   service: | ||||
|     name: matrix-jitsi-jicofo | ||||
|     state: stopped | ||||
|     enabled: no | ||||
|     daemon_reload: yes | ||||
|     enabled: false | ||||
|     daemon_reload: true | ||||
|   register: stopping_result | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jicofo_service_stat.stat.exists" | ||||
|  | ||||
| @@ -81,7 +81,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-jicofo.service removal | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jicofo_service_stat.stat.exists" | ||||
|  | ||||
| - name: Ensure Matrix jitsi-jicofo paths doesn't exist | ||||
|   | ||||
| @@ -12,8 +12,8 @@ | ||||
|     owner: "{{ matrix_user_username }}" | ||||
|     group: "{{ matrix_user_groupname }}" | ||||
|   with_items: | ||||
|     - { path: "{{ matrix_jitsi_jvb_base_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_jvb_config_path }}", when: true } | ||||
|     - {path: "{{ matrix_jitsi_jvb_base_path }}", when: true} | ||||
|     - {path: "{{ matrix_jitsi_jvb_config_path }}", when: true} | ||||
|   when: matrix_jitsi_enabled|bool and item.when | ||||
|  | ||||
| - name: Ensure jitsi-jvb Docker image is pulled | ||||
| @@ -51,7 +51,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-jvb.service installation | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "matrix_jitsi_enabled and matrix_jitsi_jvb_systemd_service_result.changed" | ||||
|  | ||||
| # | ||||
| @@ -68,8 +68,8 @@ | ||||
|   service: | ||||
|     name: matrix-jitsi-jvb | ||||
|     state: stopped | ||||
|     enabled: no | ||||
|     daemon_reload: yes | ||||
|     enabled: false | ||||
|     daemon_reload: true | ||||
|   register: stopping_result | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jvb_service_stat.stat.exists" | ||||
|  | ||||
| @@ -81,7 +81,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-jvb.service removal | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_jvb_service_stat.stat.exists" | ||||
|  | ||||
| - name: Ensure Matrix jitsi-jvb paths doesn't exist | ||||
|   | ||||
| @@ -12,9 +12,9 @@ | ||||
|     owner: "{{ matrix_user_username }}" | ||||
|     group: "{{ matrix_user_groupname }}" | ||||
|   with_items: | ||||
|     - { path: "{{ matrix_jitsi_prosody_base_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_prosody_config_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_prosody_plugins_path }}", when: true } | ||||
|     - {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 | ||||
|  | ||||
| - name: Ensure jitsi-prosody Docker image is pulled | ||||
| @@ -42,7 +42,7 @@ | ||||
|  | ||||
| - name: Ensure systemd service is reloaded after matrix-jitsi-prosody.service installation | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "matrix_jitsi_enabled and matrix_jitsi_prosody_systemd_service_result.changed" | ||||
|  | ||||
| - name: Ensure authentication is properly configured | ||||
| @@ -67,8 +67,8 @@ | ||||
|   service: | ||||
|     name: matrix-jitsi-prosody | ||||
|     state: stopped | ||||
|     enabled: no | ||||
|     daemon_reload: yes | ||||
|     enabled: false | ||||
|     daemon_reload: true | ||||
|   register: stopping_result | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists" | ||||
|  | ||||
| @@ -80,7 +80,7 @@ | ||||
|  | ||||
| - name: Ensure systemd is reloaded after matrix-jitsi-prosody.service removal | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_prosody_service_stat.stat.exists" | ||||
|  | ||||
| - name: Ensure Matrix jitsi-prosody paths doesn't exist | ||||
|   | ||||
| @@ -12,10 +12,10 @@ | ||||
|     owner: "{{ matrix_user_username }}" | ||||
|     group: "{{ matrix_user_groupname }}" | ||||
|   with_items: | ||||
|     - { path: "{{ matrix_jitsi_web_base_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_web_config_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_web_transcripts_path }}", when: true } | ||||
|     - { path: "{{ matrix_jitsi_web_crontabs_path }}", when: true } | ||||
|     - {path: "{{ matrix_jitsi_web_base_path }}", when: true} | ||||
|     - {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 | ||||
|  | ||||
| - name: Ensure jitsi-web Docker image is pulled | ||||
| @@ -53,7 +53,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-web.service installation | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "matrix_jitsi_enabled and matrix_jitsi_web_systemd_service_result.changed" | ||||
|  | ||||
| # | ||||
| @@ -70,8 +70,8 @@ | ||||
|   service: | ||||
|     name: matrix-jitsi-web | ||||
|     state: stopped | ||||
|     enabled: no | ||||
|     daemon_reload: yes | ||||
|     enabled: false | ||||
|     daemon_reload: true | ||||
|   register: stopping_result | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_web_service_stat.stat.exists" | ||||
|  | ||||
| @@ -83,7 +83,7 @@ | ||||
|  | ||||
| - name: Ensure systemd reloaded after matrix-jitsi-web.service removal | ||||
|   service: | ||||
|     daemon_reload: yes | ||||
|     daemon_reload: true | ||||
|   when: "not matrix_jitsi_enabled|bool and matrix_jitsi_web_service_stat.stat.exists" | ||||
|  | ||||
| - name: Ensure Matrix jitsi-web paths doesn't exist | ||||
| @@ -94,4 +94,3 @@ | ||||
|  | ||||
| # Intentionally not removing the Docker image when uninstalling. | ||||
| # We can't be sure it had been pulled by us in the first place. | ||||
|  | ||||
|   | ||||
| @@ -21,18 +21,14 @@ | ||||
|     - matrix_jitsi_auth_type == "internal" | ||||
|     - matrix_jitsi_prosody_auth_internal_accounts|length > 0 | ||||
|  | ||||
|  | ||||
| # | ||||
| # Tasks related to configuring other Jitsi authentication mechanisms | ||||
| # | ||||
|  | ||||
|  | ||||
|  | ||||
| # | ||||
| # Tasks related to cleaning after Jitsi authentication configuration | ||||
| # | ||||
|  | ||||
|  | ||||
| # | ||||
| # Stop Necessary Services | ||||
| # | ||||
| @@ -40,4 +36,4 @@ | ||||
|   systemd: | ||||
|     state: stopped | ||||
|     name: matrix-jitsi-prosody | ||||
|   when: matrix_jitsi_prosody_start_result.changed|bool | ||||
|   when: matrix_jitsi_prosody_start_result.changed|bool | ||||
|   | ||||
| @@ -24,7 +24,6 @@ | ||||
|   fail: | ||||
|     msg: >- | ||||
|       At least one Jitsi user needs to be defined in `matrix_jitsi_prosody_auth_internal_accounts` when using internal authentication. | ||||
|        | ||||
|       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: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user