From 627b461aacf87c18ee7ea33b3788bf37527e98ab Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 3 Feb 2019 23:26:35 +0100
Subject: [PATCH] switch to new loop syntax

---
 defaults/main.yml |  2 --
 tasks/install.yml |  4 ++--
 tasks/nginx.yml   | 18 ++----------------
 tasks/prepare.yml |  2 +-
 tasks/tls.yml     |  6 +++---
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e83e94e..c06c983 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -52,8 +52,6 @@ unifi_tls_certs_dir: "{{ unifi_base_dir }}/tls/certs"
 unifi_tls_key_dir: "{{ unifi_base_dir }}/tls/private"
 unifi_tls_cert_file: "{{ unifi_tls_certs_dir }}/mycert.pem"
 unifi_tls_key_file: "{{ unifi_tls_key_dir }}/mykey.pem"
-unifi_tls_source_use_content: False
-unifi_tls_source_use_files: True
 unifi_tls_cert_source: mycert.pem
 unifi_tls_key_source: mykey.pem
 
diff --git a/tasks/install.yml b/tasks/install.yml
index 800928c..01b8d1c 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -6,7 +6,7 @@
     owner: "{{ unifi_user }}"
     group: "{{ unifi_group }}"
     recurse: True
-  with_items:
+  loop:
     - "{{ unifi_base_dir }}"
     - "{{ unifi_base_dir }}/{{ unifi_version }}"
     - "{{ unifi_tmp_dir }}"
@@ -86,7 +86,7 @@
         state: "{{ item.state }}"
         weight: "{{ item.weight|default(omit) }}"
         table: "{{ item.table|default(omit) }}"
-      with_items: "{{ unifi_open_ports }}"
+      loop: "{{ unifi_open_ports }}"
       loop_control:
         label: "{{ item.name }}"
       when: unifi_iptables_enabled
diff --git a/tasks/nginx.yml b/tasks/nginx.yml
index 9558309..d77aaad 100644
--- a/tasks/nginx.yml
+++ b/tasks/nginx.yml
@@ -1,30 +1,16 @@
 ---
 - block:
-    - name: Copy certs and private key to nginx proxy (content)
-      copy:
-        content: "{{ item.src }}"
-        dest: "{{ item.dest }}"
-        mode: "{{ item.mode }}"
-      with_items:
-        - { src: "{{ unifi_tls_key_source }}", dest: '/etc/pki/tls/private/{{ unifi_nginx_tls_key_file }}', mode: '0600' }
-        - { src: "{{ unifi_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ unifi_nginx_tls_cert_file }}', mode: '0750' }
-      loop_control:
-        label: "{{ item.dest }}"
-      notify: __nginx_reload
-      when: unifi_tls_source_use_content
-
-    - name: Copy certs and private key to nginx proxy (files)
+    - name: Copy certs and private key to nginx proxy
       copy:
         src: "{{ item.src }}"
         dest: "{{ item.dest }}"
         mode: "{{ item.mode }}"
-      with_items:
+      loop:
         - { src: "{{ unifi_tls_key_source }}", dest: '/etc/pki/tls/private/{{ unifi_nginx_tls_key_file }}', mode: '0600' }
         - { src: "{{ unifi_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ unifi_nginx_tls_cert_file }}', mode: '0750' }
       loop_control:
         label: "{{ item.dest }}"
       notify: __nginx_reload
-      when: unifi_tls_source_use_files
   delegate_to: "{{ unifi_nginx_server }}"
   when: unifi_nginx_tls_enabled
   become: True
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index e28a996..35a50ff 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -11,7 +11,7 @@
       package:
         name: "{{ item }}"
         state: present
-      with_items:
+      loop:
         - "java-{{ unifi_openjdk_version }}-openjdk"
         - unzip
         - wget
diff --git a/tasks/tls.yml b/tasks/tls.yml
index 64925cb..fb7f78f 100644
--- a/tasks/tls.yml
+++ b/tasks/tls.yml
@@ -7,7 +7,7 @@
         owner: "{{ unifi_user }}"
         group: "{{ unifi_group }}"
         recurse: True
-      with_items:
+      loop:
         - "{{ unifi_tls_certs_dir }}"
         - "{{ unifi_tls_key_dir }}"
   become: True
@@ -19,7 +19,7 @@
         src: "{{ item.src }}"
         dest: "{{ item.dest }}"
         mode: "{{ item.mode }}"
-      with_items:
+      loop:
         - { 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:
@@ -32,7 +32,7 @@
         content: "{{ item.src }}"
         dest: "{{ item.dest }}"
         mode: "{{ item.mode }}"
-      with_items:
+      loop:
         - { 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: