From: Grant Slater <git@firefishy.com>
Date: Sun, 31 Jan 2016 16:35:45 +0000 (+0000)
Subject: Imagery - Set correct extension for mapserver
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1213ebaa3aac144fc3052839f9ead718e553ebec?ds=sidebyside

Imagery - Set correct extension for mapserver
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 8d9ffac14..ee6a8f1c0 100644
--- 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 :extension, String
+property :extension, String,
+         :is => %w(png png8 jpeg),
+         :default => "png"
 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 c71b8b9d4..29a83c27c 100644
--- 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
-  IMAGETYPE png
+  IMAGETYPE <%= @extension %>
     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 5158aba73..e1bbed8f8 100644
--- 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 %>;
 
+    # Include site imagery layers
     include /srv/imagery/nginx/<%= @name %>/layer-*.conf
-
 }