imagery: do not cache mapserver errors

[chef.git] / cookbooks / imagery / resources / layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 343ad69407d91352e4d6faddb666ab54bbbdce8b..b9fb548c35f794619108cad79b1fba72edd9f0ad 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -36,7 +36,7 @@ property :imagemode, String
 property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 18
 property :url_aliases, [String, Array], :default => []
 property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 18
 property :url_aliases, [String, Array], :default => []

-property :revision, Fixnum, :default => 1
+property :revision, Fixnum, :default => 0

 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 
 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 


@@ -54,11 +54,6 @@ action :create do
                       :overlay => overlay)
   end
 
                       :overlay => overlay)
   end
 

-  file "remove old overlay yaml" do
-    path "/srv/imagery/overlays/#{site}/#{layer}.yml"
-    action :delete
-  end
-

   template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
     cookbook "imagery"
     source "mapserver.map.erb"


@@ -72,7 +67,9 @@ action :create do
     description "Map server for #{layer} layer"
     limit_nofile 16384
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
     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_MAP_PATTERN" => "^/srv/imagery/mapserver/",
+                "MS_DEBUGLEVEL" => "0",
+                "MS_ERRORFILE" => "stderr"

     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"


@@ -125,5 +122,5 @@ end
 
 def after_created
   notifies :create, "imagery_site[#{site}]"
 
 def after_created
   notifies :create, "imagery_site[#{site}]"

-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"

 end
 end