small fixes; remove tls sub-imports

tasks/nginx.yml

@@ -1,6 +1,6 @@
 ---
 - block:
-  - name: Copy certs and private key (content)
+  - name: Copy certs and private key to nginx proxy (content)
     copy:
       content: "{{ item.src }}"
       dest: "{{ item.dest }}"
@@ -13,7 +13,7 @@
     notify: __nginx_reload
     when: unifi_tls_source_use_content
 
-  - name: Copy certs and private key (files)
+  - name: Copy certs and private key to nginx proxy (files)
     copy:
       src: "{{ item.src }}"
       dest: "{{ item.dest }}"
@@ -29,8 +29,6 @@
   when: unifi_nginx_tls_enabled
   become: True
   become_user: root
-  tags:
-    - tls_renewal
 
 - block:
   - name: Add vhost configuration file

tasks/tls.yml

@@ -13,10 +13,34 @@
   become: True
   become_user: root
 
-- import_tasks: tls_from_file.yml
-  when: unifi_tls_source_use_files
-- import_tasks: tls_from_content.yml
-  when: unifi_tls_source_use_content
+- block:
+  - name: Copy certs and private key (file)
+    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
+    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:
   - set_fact:

tasks/tls_from_content.yml

@@ -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 }}"

tasks/tls_from_file.yml

@@ -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 }}"