изменения для параметра static . теперь он может быть массивом

melezhik · Aug 16, 2012 · af9bd6c · af9bd6c
1 parent b8b277c
commit af9bd6c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/nginx-fastcgi/README.md b/nginx-fastcgi/README.md
@@ -16,11 +16,11 @@ The definition takes the following parameters:
 
 * name: specifies a single path (string) where nginx site config will be installed. No default, this must be specified.
 * socket: specifies the port or socket on which the FastCGI-server is listening. No default, this must be specified. 
-  See http://wiki.nginx.org/HttpFastcgiModule#fastcgi_pass for details.
-* static: specifies location of static files (not handled by application, but nginx), is either array or hash with following keys:
+  Check out http://wiki.nginx.org/HttpFastcgiModule#fastcgi_pass for details.
+* static: specifies location of static files (not handled by application, but nginx), is the Array of Hashes or hash with following keys:
    * location
    * root
-* servers: specifies all virtual hosts to be included into site config, is the array of hashes with following keys:
+* servers: specifies all virtual hosts to be included into site config, is an Array of Hashes with following keys:
    * ip
    * server_name
    * ssl
@@ -29,7 +29,7 @@ The definition takes the following parameters:
    * redirect
 * cookbook: specifies the cookbook name where template source comes from. By default it will use the cookbook where the definition is used.
 * fastcgi_param: specifies additional fastcgi_params to be included into location block
-* error_page - specifies custom error pages. Is the array of hashes with following keys (See http://wiki.nginx.org/HttpCoreModule#error_page for details):
+* error_page - specifies custom error pages. Is an Array of Hashes with following keys (check out http://wiki.nginx.org/HttpCoreModule#error_page for details):
  * code
  * handler
 

diff --git a/nginx-fastcgi/changes.md b/nginx-fastcgi/changes.md
@@ -1,8 +1,7 @@
 0.0.8
 ===
 - new parameter - `error_page`
-- 
-
+- `static` may be an Array
 
 0.0.7
 ===

diff --git a/nginx-fastcgi/definitions/nginx_fastcgi.rb b/nginx-fastcgi/definitions/nginx_fastcgi.rb
@@ -1,4 +1,4 @@
-define :nginx_fastcgi, :servers => [], :root => nil, :static => nil, :fastcgi_param => [], :error_page => [] do
+define :nginx_fastcgi, :servers => [], :root => nil, :static => [], :fastcgi_param => [], :error_page => [] do
 
     if params[:socket].nil? || params[:socket].empty?
         message = 'you should setup socket param. '
@@ -29,7 +29,7 @@
         cookbook params[:cookbook] || 'nginx-fastcgi'
         mode 0664
         variables({
-            :static => params[:static],
+            :static => ( (params[:static].is_a? Hash) ? [params[:static]] : params[:static] ),
             :root => params[:root],
             :socket => params[:socket],
             :servers => params[:servers],

diff --git a/nginx-fastcgi/templates/default/nginx-site.erb b/nginx-fastcgi/templates/default/nginx-site.erb
@@ -26,9 +26,11 @@ server {
         <%- end %>
 
         <%- unless  @static.nil? || @static.empty? %>
-        location <%= @static[:location] %> {
-            root <%= @static[:root] %>;
+            <%- @static.each do |item| %>
+        location <%= item[:location] %> {
+            root <%= item[:root] %>;
         }
+            <%- end %>
         <%- end %>
 
         <%- if s[:ssl] == true %>