Fix some ansible-lint-reported warnings
This commit is contained in:
		| @@ -3,7 +3,7 @@ | ||||
| - name: Fail if Synapse Simple Antispam blocked homeservers is not set | ||||
|   ansible.builtin.fail: | ||||
|     msg: "Synapse Simple Antispam is enabled, but no blocked homeservers have been set in matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers" | ||||
|   when: "matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers|length == 0" | ||||
|   when: "matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers | length == 0" | ||||
|  | ||||
| - name: Ensure git installed (RedHat) | ||||
|   ansible.builtin.yum: | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| # Unless `matrix_synapse_workers_enabled_list` is explicitly defined, | ||||
| # we'll generate it dynamically. | ||||
| - ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/workers/init.yml" | ||||
|   when: "matrix_synapse_enabled and matrix_synapse_workers_enabled and matrix_synapse_workers_enabled_list|length == 0" | ||||
|   when: "matrix_synapse_enabled and matrix_synapse_workers_enabled and matrix_synapse_workers_enabled_list | length == 0" | ||||
|  | ||||
| - ansible.builtin.set_fact: | ||||
|     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse.service'] }}" | ||||
| @@ -73,7 +73,7 @@ | ||||
|           } | ||||
|           {% endif %} | ||||
|           {% endfor %} | ||||
|       when: matrix_synapse_workers_enabled_list|length > 0 | ||||
|       when: matrix_synapse_workers_enabled_list | length > 0 | ||||
|  | ||||
|     - name: Register synapse worker metrics proxying configuration with matrix-nginx-proxy (matrix.DOMAIN/metrics/synapse/worker) | ||||
|       ansible.builtin.set_fact: | ||||
| @@ -83,5 +83,5 @@ | ||||
|             + | ||||
|             [matrix_synapse_worker_nginx_metrics_configuration_block] | ||||
|           }} | ||||
|       when: matrix_synapse_workers_enabled_list|length > 0 | ||||
|       when: matrix_synapse_workers_enabled_list | length > 0 | ||||
|   when: matrix_synapse_enabled | bool and matrix_synapse_metrics_proxying_enabled | bool | ||||
|   | ||||
| @@ -28,6 +28,6 @@ | ||||
|   when: "start_result.changed" | ||||
|  | ||||
| - name: Register user | ||||
|   ansible.builtin.command: "{{ matrix_local_bin_path }}/matrix-synapse-register-user {{ username|quote }} {{ password|quote }} {{ '1' if admin == 'yes' else '0' }}" | ||||
|   ansible.builtin.command: "{{ matrix_local_bin_path }}/matrix-synapse-register-user {{ username | quote }} {{ password | quote }} {{ '1' if admin == 'yes' else '0' }}" | ||||
|   register: matrix_synapse_register_user_result | ||||
|   changed_when: matrix_synapse_register_user_result.rc == 0 | ||||
|   | ||||
| @@ -92,7 +92,7 @@ | ||||
|       ansible.builtin.fail: | ||||
|         msg: >- | ||||
|           Expecting 4 lines in the "find rooms" result. | ||||
|   when: "matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.failed or matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.stdout_lines|length != 4" | ||||
|   when: "matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.failed or matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.stdout_lines | length != 4" | ||||
|  | ||||
| - block: | ||||
|     # matrix_synapse_rust_synapse_compress_state_eligible_rooms is a list | ||||
|   | ||||
| @@ -37,7 +37,7 @@ | ||||
|  | ||||
| - name: Populate matrix_synapse_stream_writers from enabled stream writer workers list | ||||
|   ansible.builtin.set_fact: | ||||
|     matrix_synapse_stream_writers: "{{ matrix_synapse_stream_writers | combine ({item.ansible_facts.worker.stream_writer_stream: [item.ansible_facts.worker.name]}) }}" | ||||
|     matrix_synapse_stream_writers: "{{ matrix_synapse_stream_writers | combine({item.ansible_facts.worker.stream_writer_stream: [item.ansible_facts.worker.name]}) }}" | ||||
|   with_items: "{{ matrix_synapse_workers_list_results_stream_writer_workers.results }}" | ||||
|  | ||||
| - name: Build federation sender workers | ||||
|   | ||||
| @@ -42,7 +42,7 @@ | ||||
|       ansible.builtin.fail: | ||||
|         msg: >- | ||||
|           Synapse stream_writer workers (such as {{ item }}) need to define a valid `stream_writer_stream` property | ||||
|           (not `{{ matrix_synapse_worker_details.stream_writer_stream|default('undefined') }}`). | ||||
|           (not `{{ matrix_synapse_worker_details.stream_writer_stream | default('undefined') }}`). | ||||
|           Supported types are: {{ matrix_synapse_workers_known_stream_writer_stream_types | join(', ') }} | ||||
|       when: "'stream_writer_stream' not in matrix_synapse_worker_details or matrix_synapse_worker_details.stream_writer_stream not in matrix_synapse_workers_known_stream_writer_stream_types" | ||||
|  | ||||
|   | ||||
| @@ -36,11 +36,11 @@ | ||||
|   when: "start_result.changed or postgres_start_result.changed" | ||||
|  | ||||
| - name: Generate password hash | ||||
|   ansible.builtin.shell: "{{ matrix_host_command_docker }} exec matrix-synapse /usr/local/bin/hash_password -c /data/homeserver.yaml -p {{ password|quote }}" | ||||
|   ansible.builtin.shell: "{{ matrix_host_command_docker }} exec matrix-synapse /usr/local/bin/hash_password -c /data/homeserver.yaml -p {{ password | quote }}" | ||||
|   register: password_hash | ||||
|   changed_when: false | ||||
|  | ||||
| - name: Update user password hash | ||||
|   ansible.builtin.command: "{{ matrix_local_bin_path }}/matrix-postgres-update-user-password-hash {{ username|quote }} {{ password_hash.stdout|quote }}" | ||||
|   ansible.builtin.command: "{{ matrix_local_bin_path }}/matrix-postgres-update-user-password-hash {{ username | quote }} {{ password_hash.stdout | quote }}" | ||||
|   register: matrix_synapse_update_user_password_result | ||||
|   changed_when: matrix_synapse_update_user_password_result.rc == 0 | ||||
|   | ||||
| @@ -16,7 +16,7 @@ | ||||
|   ansible.builtin.fail: | ||||
|     msg: >- | ||||
|       `{{ item }}` cannot be more than 1. This is a single-instance worker. | ||||
|   when: "vars[item]|int > 1" | ||||
|   when: "vars[item] | int > 1" | ||||
|   with_items: | ||||
|     - "matrix_synapse_workers_appservice_workers_count" | ||||
|     - "matrix_synapse_workers_user_dir_workers_count" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user