From f8ab68e40dda046171de02df6a7c12514f570bf8 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 25 May 2019 03:12:47 +0200
Subject: replace all with_items with loop

---
 roles/elevate/media/tasks/network.yml   | 20 ++++++++++----------
 roles/elevate/media/tasks/nextcloud.yml |  6 +++---
 roles/elevate/media/tasks/nginx.yml     | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'roles/elevate/media')

diff --git a/roles/elevate/media/tasks/network.yml b/roles/elevate/media/tasks/network.yml
index da7dd1db..17e82097 100644
--- a/roles/elevate/media/tasks/network.yml
+++ b/roles/elevate/media/tasks/network.yml
@@ -5,28 +5,28 @@
     state: directory
 
 - name: install netplan configs
-  template:
-    src: "netplan/{{ item }}.yaml.j2"
-    dest: "/etc/netplan/conf-available/{{ item }}.yaml"
-  with_items:
+  loop:
     - lan-only
     - r3
     - r3-with-lan
     - elevate-festival
     - elevate-office
+  template:
+    src: "netplan/{{ item }}.yaml.j2"
+    dest: "/etc/netplan/conf-available/{{ item }}.yaml"
   notify: netplan apply
 
 - name: install firewall scripts
-  template:
-    src: "firewall/{{ item }}.sh.j2"
-    dest: "/etc/saswall/{{ item }}.sh"
-    mode: 0755
-  with_items:
+  loop:
     - lan-only
     - r3
     - r3-with-lan
     - elevate-festival
     - elevate-office
+  template:
+    src: "firewall/{{ item }}.sh.j2"
+    dest: "/etc/saswall/{{ item }}.sh"
+    mode: 0755
   notify: firewall restart
 
 - name: remove default netplan config
@@ -36,7 +36,7 @@
   notify: netplan apply
 
 - name: set active netwok setup
-  with_items:
+  loop:
     - dest: /etc/netplan/01-active.yaml
       src: "conf-available/{{ network_setup }}.yaml"
     - dest: /etc/saswall/rules.sh
diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml
index cfa0acf9..65094261 100644
--- a/roles/elevate/media/tasks/nextcloud.yml
+++ b/roles/elevate/media/tasks/nextcloud.yml
@@ -98,7 +98,7 @@
       NEXTCLOUD_ADMIN_PASSWORD: "will-be-changed-later"
 
 - name: configure nextcloud upload file size limit
-  with_items:
+  loop:
     - upload_max_filesize
     - post_max_size
   lineinfile:
@@ -129,7 +129,7 @@
   import_tasks: nextcloud-config.yml
 
 - name: install nextcloud systemd units
-  with_items:
+  loop:
     - cron.service
     - cron.timer
     - rescan.service
@@ -139,7 +139,7 @@
     dest: "/etc/systemd/system/nextcloud-{{ item }}"
 
 - name: make sure nextcloud systemd timer are started and enabled
-  with_items:
+  loop:
     - cron
     - rescan
   systemd:
diff --git a/roles/elevate/media/tasks/nginx.yml b/roles/elevate/media/tasks/nginx.yml
index 2441872a..435cc751 100644
--- a/roles/elevate/media/tasks/nginx.yml
+++ b/roles/elevate/media/tasks/nginx.yml
@@ -8,12 +8,12 @@
   notify: restart nginx
 
 - name: install nginx config snippets
+  loop:
+    - ssl
+    - hsts
   copy:
     src: "{{ global_files_dir }}/common/nginx-snippets/{{ item }}.conf"
     dest: /etc/nginx/snippets/
-  with_items:
-    - ssl
-    - hsts
   notify: restart nginx
 
 - name: generate Diffie-Hellman parameters
@@ -29,9 +29,9 @@
   notify: restart nginx
 
 - name: check if acme certs already exist
+  loop: "{{ nextcloud_hostnames }}"
   stat:
     path: "/var/lib/acme/live/{{ item }}"
-  with_items: "{{ nextcloud_hostnames }}"
   register: acme_cert_stat
 
 - name: set acmecert_missing_hostnames variable
@@ -52,11 +52,11 @@
         selfsigned_interim_cert_id: "{{ selfsigned_interim_cert_id.stdout }}"
 
     - name: link to snakeoil cert for nonexistent hostnames
+      loop: "{{ acmecert_missing_hostnames }}"
       file:
         src: "../certs/{{ selfsigned_interim_cert_id }}"
         dest: "/var/lib/acme/live/{{ item }}"
         state: link
-      with_items: "{{ acmecert_missing_hostnames }}"
 
 - name: enable vhost config using acme cert
   file:
-- 
cgit v1.2.3