made locations and try_files into arrays

Author: Akos Vandra

defaults/main.yml

@@ -19,12 +19,30 @@ nginx_sites:
     listen: 8080
     server_name: localhost
     root: "/tmp/site1"
-    location1: {name: /, try_files: "$uri $uri/ /index.html"}
-    location2: {name: /images/, try_files: "$uri $uri/ /index.html"}
+    locations:
+      - name: /
+        try_files:
+          - $uri
+          - $uri/
+          - /index.html
+      - name: /images/
+        try_files:
+          - $uri
+          - $uri/
+          - /index.html
  - server:
     file_name: bar
     listen: 9090
     server_name: ansible
     root: "/tmp/site2"
-    location1: {name: /, try_files: "$uri $uri/ /index.html"}
-    location2: {name: /images/, try_files: "$uri $uri/ /index.html"}
+    locations:
+      - name: /
+        try_files:
+          - $uri
+          - $uri/
+          - /index.html
+      - name: /images/
+        try_files:
+          - $uri
+          - $uri/
+          - /index.html

templates/site.j2

@@ -6,17 +6,20 @@ server {
 {% endif %}
 
 {% for k,v in item.server.iteritems() %}
-{% if k.find('location') == -1 and k != 'file_name' %}
+{% if k != 'locations' and k != 'file_name' %}
 {{ k }} {{ v }};
 {% endif %}
-{% endfor %} 
+{% endfor %}
 
-{% for k,v in item.server.iteritems() if k.find('location') != -1 %}
-  location {{ v.name }} {
-{% for x,y in v.iteritems() if x != 'name' %} 
-      {{ x }} {{ y }};
+{% for loc in item.server.locations %}
+  location {{ loc.name }} {
+{% for x,y in loc.iteritems() if x != 'name' %}
+    {% if x == 'try_files' %}
+       {{ x }} {{ y | join(' ')}};
+    {% else %}
+       {{ x }} {{ y }};
+    {% endif %}
 {% endfor %}
   }
 {% endfor %}
 }
-