fix linter

This commit is contained in:
nd 2021-07-17 01:41:43 +02:00
parent 13d7194e4f
commit 630a536c7f
No known key found for this signature in database
GPG key ID: 21B5CD4DEE3670E9
3 changed files with 41 additions and 34 deletions

View file

@ -1,16 +1,19 @@
---
- set_fact:
- name: store nginx vars
set_fact:
nginx_certs: "{{ nginx.vhosts|nginx_vhosts_to_certificates }}"
inventory_certs: "{{ certificates.certs|d({}) }}"
selfsigned_cert: "{ '{{ inventory_hostname }}': { 'backend': 'selfsigned' }}"
- include_role:
- name: generate certificates for vhosts
include_role:
name: certificates
vars:
certificates:
certs: "{{ {}|combine( (selfsigned_cert|from_yaml if nginx.snakeoil_default else {}), nginx_certs, inventory_certs, recursive=True) }}"
- debug:
- name: debug nginx dict
debug:
verbosity: 1
var: nginx
@ -38,34 +41,24 @@
template:
src: ssl_files.conf.j2
dest: /etc/nginx/conf.d/ssl_files.conf
owner: root
group: root
mode: 0644
notify:
- restart nginx
- name: execute dns template
- name: execute templates
loop:
- dns.conf
- upstreams.conf
- proxy.conf
- maps.conf
template:
src: dns.conf.j2
dest: /etc/nginx/conf.d/dns.conf
notify:
- restart nginx
- name: execute upstream template
template:
src: upstreams.conf.j2
dest: /etc/nginx/conf.d/upstreams.conf
notify:
- restart nginx
- name: execute proxy template
template:
src: proxy.conf.j2
dest: /etc/nginx/conf.d/proxy.conf
notify:
- restart nginx
- name: execute maps template
template:
src: maps.conf.j2
dest: /etc/nginx/conf.d/maps.conf
src: "{{ item }}.j2"
dest: "/etc/nginx/conf.d/{{ item }}"
owner: root
group: root
mode: 0644
notify:
- restart nginx
@ -73,6 +66,9 @@
template:
src: vhost.conf.j2
dest: "/etc/nginx/sites-available/{{ item.key }}"
owner: root
group: root
mode: 0644
with_dict: "{{ {}|combine((nginx_forcessl_vhost if nginx.force_ssl else {}), nginx.vhosts, recursive=True) }}"
notify:
- restart nginx
@ -93,7 +89,7 @@
copy:
src: monitoring
dest: /etc/nginx/sites-available/nginx-status
mode: 0755
mode: 0644
notify:
- restart nginx