nginx: you can define multiple location blocks now in nginx::site::proxy

daks · Jan 2, 2012 · dc0638f · dc0638f
1 parent 4caeab6
commit dc0638f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/nginx/README b/nginx/README
@@ -75,11 +75,9 @@ nginx::site::proxy
         port (optional, default: 80):
             its port
 
-        location_url (optional):
-            url for a location block
-
-        location_content (optional):
-            content of this location block
+        location_blocks (optional):
+            an hash { $url1 => $content1, $url2 => $content2 } to define blocks like
+             location $url1 { $content1 }
 
         default_vhost (optional, default: false):
             is this vhost the default one?

diff --git a/nginx/manifests/site/proxy.pp b/nginx/manifests/site/proxy.pp
@@ -4,8 +4,7 @@
                           $port='80',
                           $upstream='',
                           $root_dir='',
-                          $location_url='',
-                          $location_content='',
+                          $location_blocks={},
                           $default_vhost=false,
                           $enabled=true) {
 

diff --git a/nginx/templates/proxy.erb b/nginx/templates/proxy.erb
@@ -18,12 +18,12 @@ server {
 
     root                <%= root_dir %>;
 
-    <% if location_url != "" then %>
-    location <%= location_url %> {
-        <%= location_content %>
+    <% location_blocks.each_pair do |url, content| %>
+    location <%= url %> {
+        <%= content %>
     }
-
     <% end %>
+
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;