From 1aff2ca24799dafd28201f128a658e35377dd2a6 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 9 Aug 2022 10:54:39 +0300 Subject: [PATCH] Fix ansible-lint errors --- roles/matrix-conduit/defaults/main.yml | 2 +- roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/matrix-conduit/defaults/main.yml b/roles/matrix-conduit/defaults/main.yml index 9ee832825..25036939a 100644 --- a/roles/matrix-conduit/defaults/main.yml +++ b/roles/matrix-conduit/defaults/main.yml @@ -4,7 +4,7 @@ matrix_conduit_enabled: true -matrix_conduit_docker_image: "{{ matrix_conduit_docker_image_name_prefix}}matrixconduit/matrix-conduit:{{ matrix_conduit_docker_image_tag }}" +matrix_conduit_docker_image: "{{ matrix_conduit_docker_image_name_prefix }}matrixconduit/matrix-conduit:{{ matrix_conduit_docker_image_tag }}" matrix_conduit_docker_image_name_prefix: "docker.io/" matrix_conduit_docker_image_tag: "v0.4.0" matrix_conduit_docker_image_force_pull: "{{ matrix_conduit_docker_image.endswith(':latest') }}" diff --git a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml index 2f65e6565..4d93e769c 100644 --- a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml +++ b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml @@ -69,17 +69,17 @@ when: "not matrix_nginx_proxy_proxy_dendrite_enabled | bool" - name: Ensure Matrix nginx-proxy configuration for matrix-conduit exists - template: + ansible.builtin.template: src: "{{ role_path }}/templates/nginx/conf.d/matrix-conduit.conf.j2" dest: "{{ matrix_nginx_proxy_confd_path }}/matrix-conduit.conf" mode: 0644 - when: matrix_nginx_proxy_proxy_conduit_enabled|bool + when: matrix_nginx_proxy_proxy_conduit_enabled | bool - name: Ensure Matrix nginx-proxy configuration for matrix-conduit deleted - file: + ansible.builtin.file: path: "{{ matrix_nginx_proxy_confd_path }}/matrix-conduit.conf" state: absent - when: "not matrix_nginx_proxy_proxy_conduit_enabled|bool" + when: "not matrix_nginx_proxy_proxy_conduit_enabled | bool" - name: Ensure Matrix nginx-proxy configuration for Element domain exists ansible.builtin.template: