From 119a8578ecb325faec8c71b2cbaaae263ce51778 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Wed, 7 Jul 2021 14:10:08 +0200
Subject: [PATCH] syntax cleanup.

---
 tasks/nginx-virtualhosts.yml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/tasks/nginx-virtualhosts.yml b/tasks/nginx-virtualhosts.yml
index b796d0c..c1c59c1 100644
--- a/tasks/nginx-virtualhosts.yml
+++ b/tasks/nginx-virtualhosts.yml
@@ -1,7 +1,10 @@
 ---
 - block:
     - name: Create the nginx webroot if different from the default
-      file: dest={{ nginx_webroot }} state=directory mode=0755
+      file:
+        dest: '{{ nginx_webroot }}'
+        state: directory
+        mode: 0755
       when: nginx_webroot != '/usr/share/nginx/html'
 
   tags: [ 'nginx', 'virtualhost' ]
@@ -9,13 +12,21 @@
 - name: Install and enable the nginx virtualhost files on Deb based systems
   block:
     - name: Install the nginx virtualhost files
-      template: src=nginx-virthost.j2 dest=/etc/nginx/sites-available/{{ item.virthost_name }} owner=root group=root mode=0444
-      loop: '{{ nginx_virthosts | default(omit) }}'
+      template:
+        src: nginx-virthost.j2
+        dest: '/etc/nginx/sites-available/{{ item.virthost_name }}'
+        owner: root
+        group: root
+        mode: 0444
+      loop: '{{ nginx_virthosts }}'
       notify: Reload nginx
 
     - name: Enable the nginx virtualhosts
-      file: src=/etc/nginx/sites-available/{{ item.virthost_name }} dest=/etc/nginx/sites-enabled/{{ item.virthost_name }} state=link
-      loop: '{{ nginx_virthosts | default(omit) }}'
+      file:
+        src: '/etc/nginx/sites-available/{{ item.virthost_name }}'
+        dest: '/etc/nginx/sites-enabled/{{ item.virthost_name }}'
+        state: link
+      loop: '{{ nginx_virthosts }}'
       notify: Reload nginx
 
   when: ansible_distribution_file_variety == "Debian"
@@ -24,8 +35,13 @@
 - name: Install and enable the nginx virtualhost files on RH based systems
   block:
   - name: Install the nginx virtualhost files
-    template: src=nginx-virthost.j2 dest=/etc/nginx/conf.d/{{ item.virthost_name }}.conf owner=root group=root mode=0444
-    loop: '{{ nginx_virthosts | default(omit) }}'
+    template:
+      src: nginx-virthost.j2
+      dest: '/etc/nginx/conf.d/{{ item.virthost_name }}.conf'
+      owner: root
+      group: root
+      mode: 0444
+    loop: '{{ nginx_virthosts }}'
     notify: Reload nginx
 
   - name: nginx must be able to network connect when used as a proxy
@@ -33,7 +49,7 @@
       name: httpd_can_network_connect
       state: yes
       persistent: yes
-    loops: '{{ nginx_virthosts | default(omit) }}'
+    loop: '{{ nginx_virthosts }}'
     when: item.proxy_standard_setup is defined and item.proxy_standard_setup
 
   when: ansible_distribution_file_variety == "RedHat"