Fix linter

This commit is contained in:
Emilien Mantel
2022-11-25 09:52:40 +01:00
parent 55e075ac2b
commit 9f727adcb5
15 changed files with 61 additions and 59 deletions

View File

@@ -13,7 +13,7 @@
- name: SET_FACT | Assign var with certificates to create
ansible.builtin.set_fact:
acme_create: "{{ acme_create | default([]) + [ (item.item) ] }}"
acme_create: "{{ acme_create | default([]) + [(item.item)] }}"
loop: "{{ acme_installed_certs.results }}"
when: item.skipped is not defined and (not item.stat.exists or item.stat.size == 0)
@@ -80,7 +80,7 @@
creates: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
loop: "{{ nginx_ssl_pairs }}"
when: item.acme is defined and item.acme
notify: restart nginx
notify: Restart nginx
rescue:
@@ -95,7 +95,7 @@
path: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
state: absent
loop: "{{ acme_create }}"
notify: restart nginx
notify: Restart nginx
- name: META | Flush handlers
ansible.builtin.meta: flush_handlers

View File

@@ -1,8 +1,8 @@
---
- name: IMPORT_TASKS | standard.yml
import_tasks: standard.yml
ansible.builtin.import_tasks: standard.yml
- name: IMPORT_TASKS | acme.yml
import_tasks: acme.yml
ansible.builtin.import_tasks: acme.yml
when: nginx_acmesh

View File

@@ -1,6 +1,8 @@
---
- block:
- name: Generate DH if needed
when: nginx_dh is not string
block:
- name: STAT | Get info about DH file
ansible.builtin.stat:
@@ -17,9 +19,7 @@
- name: COMMAND | Generate DH file
ansible.builtin.command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
when: not stat_dh_file.stat.exists or (dh_info.stdout | int != nginx_dh_length | int)
notify: restart nginx
when: nginx_dh is not string
notify: Restart nginx
- name: COPY | Deploy DH file from vars
ansible.builtin.copy:
@@ -29,7 +29,7 @@
group: root
mode: 0640
when: nginx_dh is string
notify: restart nginx
notify: Restart nginx
- name: FILE | Create SSL directories
ansible.builtin.file:
@@ -51,7 +51,7 @@
mode: 0640
loop: "{{ nginx_ssl_pairs }}"
when: item.key is defined
notify: restart nginx
notify: Restart nginx
no_log: "{{ not nginx_debug_role }}"
- name: COPY | Deploy SSL certs
@@ -63,7 +63,7 @@
mode: 0644
loop: "{{ nginx_ssl_pairs }}"
when: item.cert is defined
notify: restart nginx
notify: Restart nginx
no_log: "{{ not nginx_debug_role }}"
- name: COMMAND | Create self-signed certificates
@@ -78,5 +78,5 @@
creates: "{{ '/tmp/dummy' if item.force is defined and item.force else item | nginx_cert_path(nginx_ssl_dir) }}"
loop: "{{ nginx_ssl_pairs }}"
when: item.self_signed is defined
notify: restart nginx
notify: Restart nginx
no_log: "{{ not nginx_debug_role }}"