Imagery - Fix url_aliases

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 6c6c2387f8b11d105c8beb74ee5b672dd26758d6..25bcd7b4bb1a6b2cc7b8b8cec4186fe7be07b3a7 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -35,7 +35,7 @@ property :extension, String,
          :is => %w(png png8 jpeg),
          :default => "png"
 property :max_zoom, Fixnum, :default => 23
-property :url_aliases, [String, Array]
+property :url_aliases, [String, Array], :default => []
 
 action :create do
   template "/srv/imagery/mapserver/layer-#{layer}.map" do

diff --git a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
index 1c58bd4e3e8aa8c096c84234e8a7942d38b15236..18be9f53336793528a8533bc6e16060debd45f21 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -2,7 +2,7 @@
 
 location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   # Override QUERY_STRING to force mapserver query parameters
-  fastcgi_param  QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
+  fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
   fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @layer %>.socket";
   include fastcgi_params;
   gzip off;