From f1a983198c7947b7caac56144f97cb1f35ea7007 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Mon, 10 Jun 2019 20:20:09 +0200 Subject: [PATCH] ansible-playbooks/general#85 Linting [skip-ci] --- tasks/cert_generate.yml | 6 +++--- tasks/install.yml | 2 +- tasks/main.yml | 4 ++-- tasks/renew.yml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/cert_generate.yml b/tasks/cert_generate.yml index 2c0821b..5934edd 100644 --- a/tasks/cert_generate.yml +++ b/tasks/cert_generate.yml @@ -20,12 +20,12 @@ - name: Install New Cert via webroot shell: certbot certonly --expand --non-interactive --config /etc/letsencrypt/{{ cert.domain }}.ini --cert-name {{ cert.domain }} --webroot-path /var/www/html --webroot - ignore_errors: true + ignore_errors: yes when: groups.proxyserver is not defined or inventory_hostname not in groups.proxyserver - name: Install New Cert via HaProxy shell: certbot certonly --expand --non-interactive --config /etc/letsencrypt/{{ cert.domain }}.ini --http-01-port {{ port }} --preferred-challenges http-01 --cert-name {{ cert.domain }} - ignore_errors: true + ignore_errors: yes when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver - name: Close Port @@ -44,7 +44,7 @@ name: '{{ item }}' state: started with_items: '{{ letsencrypt_pause_services|default([]) }}' - ignore_errors: true + ignore_errors: yes tags: - ApacheConfig diff --git a/tasks/install.yml b/tasks/install.yml index 5daea03..7173613 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -27,4 +27,4 @@ - /usr/local/bin/certbot - /usr/bin/certbot ignore_errors: yes - failed_when: false + failed_when: no diff --git a/tasks/main.yml b/tasks/main.yml index 6bca8a3..9e5a7d0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -18,8 +18,8 @@ stat: path: /etc/letsencrypt/live register: letsencrypt_certs_available - failed_when: false - changed_when: false + failed_when: no + changed_when: no tags: - renew diff --git a/tasks/renew.yml b/tasks/renew.yml index 538ec6b..77c2c2e 100644 --- a/tasks/renew.yml +++ b/tasks/renew.yml @@ -21,14 +21,14 @@ - name: Renew Existing Certs via webroot shell: certbot renew --non-interactive --webroot-path /var/www/html --webroot - ignore_errors: true + ignore_errors: yes register: renew_result changed_when: "'No renewals were attempted.' not in renew_result.stdout" when: groups.proxyserver is not defined or inventory_hostname not in groups.proxyserver - name: Renew Existing Certs via HaProxy shell: certbot renew --non-interactive --http-01-port {{ port }} --preferred-challenges http-01 - ignore_errors: true + ignore_errors: yes register: renew_result changed_when: "'No renewals were attempted.' not in renew_result.stdout" when: groups.proxyserver is defined and inventory_hostname in groups.proxyserver @@ -55,4 +55,4 @@ name: '{{ item }}' state: started with_items: '{{ letsencrypt_pause_services|default([]) }}' - ignore_errors: true + ignore_errors: yes -- GitLab