small fixes; remove tls sub-imports
This commit is contained in:
parent
6155049503
commit
4918de16b7
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
- block:
|
- block:
|
||||||
- name: Copy certs and private key (content)
|
- name: Copy certs and private key to nginx proxy (content)
|
||||||
copy:
|
copy:
|
||||||
content: "{{ item.src }}"
|
content: "{{ item.src }}"
|
||||||
dest: "{{ item.dest }}"
|
dest: "{{ item.dest }}"
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
notify: __nginx_reload
|
notify: __nginx_reload
|
||||||
when: unifi_tls_source_use_content
|
when: unifi_tls_source_use_content
|
||||||
|
|
||||||
- name: Copy certs and private key (files)
|
- name: Copy certs and private key to nginx proxy (files)
|
||||||
copy:
|
copy:
|
||||||
src: "{{ item.src }}"
|
src: "{{ item.src }}"
|
||||||
dest: "{{ item.dest }}"
|
dest: "{{ item.dest }}"
|
||||||
|
@ -29,8 +29,6 @@
|
||||||
when: unifi_nginx_tls_enabled
|
when: unifi_nginx_tls_enabled
|
||||||
become: True
|
become: True
|
||||||
become_user: root
|
become_user: root
|
||||||
tags:
|
|
||||||
- tls_renewal
|
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: Add vhost configuration file
|
- name: Add vhost configuration file
|
||||||
|
|
|
@ -13,10 +13,34 @@
|
||||||
become: True
|
become: True
|
||||||
become_user: root
|
become_user: root
|
||||||
|
|
||||||
- import_tasks: tls_from_file.yml
|
- block:
|
||||||
when: unifi_tls_source_use_files
|
- name: Copy certs and private key (file)
|
||||||
- import_tasks: tls_from_content.yml
|
copy:
|
||||||
when: unifi_tls_source_use_content
|
src: "{{ item.src }}"
|
||||||
|
dest: "{{ item.dest }}"
|
||||||
|
mode: "{{ item.mode }}"
|
||||||
|
with_items:
|
||||||
|
- { src: "{{ unifi_tls_key_source }}", dest: '{{ unifi_tls_key_file }}', mode: '0600' }
|
||||||
|
- { src: "{{ unifi_tls_cert_source }}", dest: '{{ unifi_tls_cert_file }}', mode: '0750' }
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.dest }}"
|
||||||
|
register: __unifi_certs_file
|
||||||
|
when: unifi_tls_source_use_files
|
||||||
|
|
||||||
|
- name: Copy certs and private key (content)
|
||||||
|
copy:
|
||||||
|
content: "{{ item.src }}"
|
||||||
|
dest: "{{ item.dest }}"
|
||||||
|
mode: "{{ item.mode }}"
|
||||||
|
with_items:
|
||||||
|
- { src: "{{ unifi_tls_key_source }}", dest: '{{ unifi_tls_key_file }}', mode: '0600' }
|
||||||
|
- { src: "{{ unifi_tls_cert_source }}", dest: '{{ unifi_tls_cert_file }}', mode: '0750' }
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.dest }}"
|
||||||
|
register: __unifi_certs_content
|
||||||
|
when: unifi_tls_source_use_content
|
||||||
|
become: True
|
||||||
|
become_user: "{{ unifi_user }}"
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- set_fact:
|
- set_fact:
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
---
|
|
||||||
- name: Copy certs and private key
|
|
||||||
copy:
|
|
||||||
content: "{{ item.src }}"
|
|
||||||
dest: "{{ item.dest }}"
|
|
||||||
mode: "{{ item.mode }}"
|
|
||||||
with_items:
|
|
||||||
- { src: "{{ unifi_tls_key_source }}", dest: '{{ unifi_tls_key_file }}', mode: '0600' }
|
|
||||||
- { src: "{{ unifi_tls_cert_source }}", dest: '{{ unifi_tls_cert_file }}', mode: '0750' }
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.dest }}"
|
|
||||||
register: __unifi_certs_content
|
|
||||||
become: True
|
|
||||||
become_user: "{{ unifi_user }}"
|
|
|
@ -1,14 +0,0 @@
|
||||||
---
|
|
||||||
- name: Copy certs and private key
|
|
||||||
copy:
|
|
||||||
src: "{{ item.src }}"
|
|
||||||
dest: "{{ item.dest }}"
|
|
||||||
mode: "{{ item.mode }}"
|
|
||||||
with_items:
|
|
||||||
- { src: "{{ unifi_tls_key_source }}", dest: '{{ unifi_tls_key_file }}', mode: '0600' }
|
|
||||||
- { src: "{{ unifi_tls_cert_source }}", dest: '{{ unifi_tls_cert_file }}', mode: '0750' }
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.dest }}"
|
|
||||||
register: __unifi_certs_file
|
|
||||||
become: True
|
|
||||||
become_user: "{{ unifi_user }}"
|
|
Loading…
Reference in New Issue
Block a user