From: Grant Slater <git@firefishy.com>
Date: Sun, 31 Jan 2016 21:44:30 +0000 (+0000)
Subject: Imagery - Fix url_aliases
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/0bf2737a18d94a6083fb6871281dc84ee6a1c24e?hp=3175024da99372ccd3fccd44f1160c5d43213b6e

Imagery - Fix url_aliases
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 6c6c2387f..25bcd7b4b 100644
--- 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 1c58bd4e3..18be9f533 100644
--- 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;