From 0bf2737a18d94a6083fb6871281dc84ee6a1c24e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 31 Jan 2016 21:44:30 +0000 Subject: [PATCH] Imagery - Fix url_aliases --- cookbooks/imagery/resources/layer.rb | 2 +- .../templates/default/nginx_imagery_layer_fragment.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; -- 2.43.2