From 2649d9d8bb128dffc323d3cd3888f9d1158cf1e7 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 8 Apr 2023 08:10:22 +0300 Subject: [PATCH] Fix lint-reported errors --- requirements.yml | 2 ++ .../matrix-coturn/tasks/setup_install.yml | 8 -------- .../tasks/main.yml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/requirements.yml b/requirements.yml index c5d4c8ecd..26414d8e9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,3 +1,5 @@ +--- + - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-aux.git version: v1.0.0-0 name: aux diff --git a/roles/custom/matrix-coturn/tasks/setup_install.yml b/roles/custom/matrix-coturn/tasks/setup_install.yml index 1cb8bd696..503ffae10 100644 --- a/roles/custom/matrix-coturn/tasks/setup_install.yml +++ b/roles/custom/matrix-coturn/tasks/setup_install.yml @@ -73,7 +73,6 @@ src: "{{ role_path }}/templates/systemd/matrix-coturn.service.j2" dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-coturn.service" mode: 0644 - register: matrix_coturn_systemd_service_change_results # This may be unnecessary when more long-lived certificates are used. # We optimize for the common use-case though (short-lived Let's Encrypt certificates). @@ -83,7 +82,6 @@ src: "{{ role_path }}/templates/systemd/{{ item }}.j2" dest: "{{ devture_systemd_docker_base_systemd_path }}/{{ item }}" mode: 0644 - register: "matrix_coturn_systemd_service_change_results" when: "matrix_coturn_tls_enabled | bool" with_items: - matrix-coturn-reload.service @@ -94,13 +92,7 @@ ansible.builtin.file: path: "{{ item }}" state: absent - register: "matrix_coturn_systemd_service_change_results" when: "not matrix_coturn_tls_enabled | bool" with_items: - matrix-coturn-reload.service - matrix-coturn-reload.timer - -- name: Ensure systemd reloaded if systemd units changed - ansible.builtin.service: - daemon_reload: true - when: "matrix_coturn_systemd_service_change_results.changed" diff --git a/roles/custom/matrix-synapse-auto-compressor/tasks/main.yml b/roles/custom/matrix-synapse-auto-compressor/tasks/main.yml index 2cce1f122..5993e4f9b 100644 --- a/roles/custom/matrix-synapse-auto-compressor/tasks/main.yml +++ b/roles/custom/matrix-synapse-auto-compressor/tasks/main.yml @@ -1,20 +1,20 @@ --- -- block: +- tags: + - setup-all + - setup-synapse-auto-compressor + - install-all + - install-synapse-auto-compressor + block: - when: matrix_synapse_auto_compressor_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" - when: matrix_synapse_auto_compressor_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/install.yml" - tags: + +- tags: - setup-all - setup-synapse-auto-compressor - - install-all - - install-synapse-auto-compressor - -- block: + block: - when: not matrix_synapse_auto_compressor_enabled | bool ansible.builtin.include_tasks: "{{ role_path }}/tasks/uninstall.yml" - tags: - - setup-all - - setup-synapse-auto-compressor