From e1e26dacafda39ba3f55f7b00a1101ad8d0b938e Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 15 Nov 2025 18:13:24 +0100 Subject: use the builtin quote filter everywhere --- roles/etckeeper/handlers/commit.yml | 4 ++-- roles/etckeeper/tasks/ignore.yml | 2 +- roles/etckeeper_commit/tasks/main.yml | 2 +- roles/letsencrypt/tasks/domain.yml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'roles') diff --git a/roles/etckeeper/handlers/commit.yml b/roles/etckeeper/handlers/commit.yml index e066503..f29de0d 100644 --- a/roles/etckeeper/handlers/commit.yml +++ b/roles/etckeeper/handlers/commit.yml @@ -8,7 +8,7 @@ set -o pipefail && \ git status --porcelain=v1 \ | cut -c 4- \ - | grep -G -v '^{{ paths | map("regex_replace", "^/", "") | list | join("\|^") }}' + | grep -G -v {{ ('^' + (paths | map("regex_replace", "^/", "") | list | join("\|^"))) | quote }} args: chdir: /etc register: git_status @@ -25,4 +25,4 @@ - name: etckeeper commit become: true ansible.builtin.command: | - etckeeper commit '{{ commit_msg }}' + etckeeper commit {{ commit_msg | quote }} diff --git a/roles/etckeeper/tasks/ignore.yml b/roles/etckeeper/tasks/ignore.yml index a798368..203da11 100644 --- a/roles/etckeeper/tasks/ignore.yml +++ b/roles/etckeeper/tasks/ignore.yml @@ -14,5 +14,5 @@ when: gitignore.changed become: true ansible.builtin.command: # noqa: command-instead-of-module - cmd: git rm -r --ignore-unmatch --cached -- '{{ ignore_path | regex_replace("^/", "") }}' + cmd: git rm -r --ignore-unmatch --cached -- {{ ignore_path | regex_replace("^/", "") | quote }} chdir: /etc diff --git a/roles/etckeeper_commit/tasks/main.yml b/roles/etckeeper_commit/tasks/main.yml index a05d9bd..265c8e5 100644 --- a/roles/etckeeper_commit/tasks/main.yml +++ b/roles/etckeeper_commit/tasks/main.yml @@ -34,4 +34,4 @@ - name: etckeeper commit become: true ansible.builtin.command: | - etckeeper commit '{{ etckeeper_commit_msg }}' + etckeeper commit {{ etckeeper_commit_msg | quote }} diff --git a/roles/letsencrypt/tasks/domain.yml b/roles/letsencrypt/tasks/domain.yml index 0ff74e9..7179a40 100644 --- a/roles/letsencrypt/tasks/domain.yml +++ b/roles/letsencrypt/tasks/domain.yml @@ -16,11 +16,11 @@ - name: 'Create certificate: {{ certificate_name }}' ansible.builtin.command: | certbot certonly --noninteractive --agree-tos \ - --cert-name '{{ certificate_name }}' \ - --email '{{ letsencrypt_email }}' \ - --domains '{{ certificate_domains | join(',') }}' \ + --cert-name {{ certificate_name | quote }} \ + --email {{ letsencrypt_email | quote }} \ + --domains {{ certificate_domains | join(',') | quote }} \ --preferred-challenges dns \ --dns-digitalocean \ - --dns-digitalocean-credentials '{{ letsencrypt_credentials_ini }}' \ + --dns-digitalocean-credentials {{ letsencrypt_credentials_ini | quote }} \ --dns-digitalocean-propagation-seconds 30 when: domain_list.changed -- cgit v1.3