Imagery - Set correct extension for mapserver

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 8d9ffac141af9f8937845b27cc23e5f7acb452ab..ee6a8f1c06ce1c3d291693ddb82d3a6391be55f0 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -30,7 +30,9 @@ property :extent, String
 property :background, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :background, String
 property :resample, String, :default => "average"
 property :imagemode, String

-property :extension, String
+property :extension, String,
+         :is => %w(png png8 jpeg),
+         :default => "png"

 property :max_zoom, Fixnum, :default => 23
 
 action :create do
 property :max_zoom, Fixnum, :default => 23
 
 action :create do

diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb
index c71b8b9d4d5883a61c1aff6c7f8d1203f6b51873..29a83c27c7ab50b8a652cbb007f0ed083319c85e 100644 (file)
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -4,7 +4,7 @@ MAP
   STATUS ON
   SIZE 256 256
   UNITS METERS
   STATUS ON
   SIZE 256 256
   UNITS METERS

-  IMAGETYPE png
+  IMAGETYPE <%= @extension %>

     PROJECTION
     "init=<%= @projection %>"
   END
     PROJECTION
     "init=<%= @projection %>"
   END

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index 5158aba7367788d0dc0d368a79223f3ca5b3f064..e1bbed8f8bb6576ab3a65b225625873743fc2e2f 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -2,6 +2,6 @@ server {
     listen       80;
     server_name  <%= @name %>;
 
     listen       80;
     server_name  <%= @name %>;
 

+    # Include site imagery layers

     include /srv/imagery/nginx/<%= @name %>/layer-*.conf
     include /srv/imagery/nginx/<%= @name %>/layer-*.conf

-

 }
 }