use with_dict instead of accessing keys from dict.keys() (#150) (#153)

tasks/configuration.yml

@@ -2,49 +2,51 @@
 - name: Copy the nginx configuration file
   template:
     src: nginx.conf.j2
-    dest: "{{nginx_conf_dir}}/nginx.conf"
+    dest: "{{ nginx_conf_dir }}/nginx.conf"
   notify:
    - restart nginx
 
 - name: Ensure auth_basic files created
   template:
     src: auth_basic.j2
-    dest: "{{nginx_conf_dir}}/auth_basic/{{ item }}"
+    dest: "{{ nginx_conf_dir }}/auth_basic/{{ item.key }}"
     owner: root
-    group: "{{nginx_group}}"
+    group: "{{ nginx_group }}"
     mode: 0750
-  with_items: "{{ nginx_auth_basic_files.keys() }}"
+  with_dict: "{{ nginx_auth_basic_files }}"
 
 - name: Create the configurations for sites
   template:
-    src: "{{ nginx_sites[item].template | default('site.conf.j2') }}"
-    dest: "{{nginx_conf_dir}}/sites-available/{{ item }}.conf"
-  with_items: "{{ nginx_sites.keys() | difference(nginx_remove_sites) }}"
+    src: "{{ item.value.template | default('site.conf.j2') }}"
+    dest: "{{ nginx_conf_dir }}/sites-available/{{ item.key }}.conf"
+  with_dict: "{{ nginx_sites }}"
+  when: item.key not in nginx_remove_sites
   notify:
    - reload nginx
 
 - name: Create links for sites-enabled
   file:
     state: link
-    src: "{{nginx_conf_dir}}/sites-available/{{ item }}.conf"
-    dest: "{{nginx_conf_dir}}/sites-enabled/{{ item }}.conf"
-  with_items: "{{ nginx_sites.keys() | difference(nginx_remove_sites) }}"
+    src: "{{ nginx_conf_dir }}/sites-available/{{ item.key }}.conf"
+    dest: "{{ nginx_conf_dir }}/sites-enabled/{{ item.key }}.conf"
+  with_dict: "{{ nginx_sites }}"
+  when: item.key not in nginx_remove_sites
   notify:
    - reload nginx
 
 - name: Create the configurations for independent config file
   template:
     src: config.conf.j2
-    dest: "{{nginx_conf_dir}}/conf.d/{{ item }}.conf"
-  with_items: "{{ nginx_configs.keys() }}"
+    dest: "{{ nginx_conf_dir }}/conf.d/{{ item.key }}.conf"
+  with_dict: "{{ nginx_configs }}"
   notify:
    - reload nginx
 
 - name: Create the configurations for independent config file for streams
   template:
     src: config_stream.conf.j2
-    dest: "{{nginx_conf_dir}}/conf.d/stream/{{ item }}.conf"
-  with_items: "{{ nginx_stream_configs.keys() }}"
+    dest: "{{ nginx_conf_dir }}/conf.d/stream/{{ item.key }}.conf"
+  with_dict: "{{ nginx_stream_configs }}"
   notify:
    - reload nginx
   when: nginx_official_repo_mainline

templates/auth_basic.j2

@@ -1,5 +1,5 @@
 #{{ ansible_managed }}
 
-{% for v in nginx_auth_basic_files[item] %}
+{% for v in item.value %}
 {{ v }}
 {% endfor %}

templates/config.conf.j2

@@ -1,6 +1,6 @@
 #{{ ansible_managed }}
 
-{% for v in nginx_configs[item] %}
+{% for v in item.value %}
 {% if v.find('\n') != -1 %}
 {{v}}
 {% else %}

templates/config_stream.conf.j2

@@ -1,6 +1,6 @@
 #{{ ansible_managed }}
 
-{% for v in nginx_stream_configs[item] %}
+{% for v in item.value %}
 {% if v.find('\n') != -1 %}
 {{v}}
 {% else %}

templates/site.conf.j2

@@ -1,6 +1,7 @@
 #{{ ansible_managed }}
+
 server {
-{% for v in nginx_sites[item] %}
+{% for v in item.value %}
 {% if v.find('\n') != -1 %}
    {{v.replace("\n","\n   ")}}
 {% else %}