X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9f13c244211f5683f232f7cc32fac53be8d0b3ec..a884ecbc667c29750d26ca2ad8f325f857ead5d3:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 22509eb57..685631dc6 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -31,11 +31,10 @@ property :extent, String
 property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
-property :extension, String,
-         :is => %w(png png8 jpeg),
-         :default => "png"
+property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
+property :revision, Fixnum, :default => 1
 
 action :create do
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
@@ -51,12 +50,10 @@ action :create do
     description "Map server for #{layer} layer"
     limit_nofile 16384
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
-                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
-                "MS_ERRORFILE" => "/tmp/mapserver-layer-#{layer}.log",
-                "MS_DEBUGLEVEL" => "5"
+                "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/"
     user "imagery"
     group "imagery"
-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -f /usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -- /usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv"
     restart "on-failure"
   end