X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4237ed0cf20c0db1beb664d88be242130c854da8..28846fc961ca1c067b9ff5ad85a8c6e5d3b7b713:/cookbooks/imagery/resources/layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index b9ffd6772..b9fb548c3 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -25,7 +25,7 @@ property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
 property :root_layer, [TrueClass, FalseClass], :default => false
-property :text, String
+property :title, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
@@ -34,34 +34,24 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
-property :max_zoom, Fixnum, :default => 23
+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
 
 action :create do
-  file "create layer yaml definition" do
+  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
     owner "root"
     group "root"
     mode 0644
-    if new_resource.overlay
-      path "/srv/imagery/overlays/#{site}/#{layer}.yml"
-    else
-      path "/srv/imagery/layers/#{site}/#{layer}.yml"
-    end
     content YAML.dump(:name => layer,
-                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :title => title || layer,
+                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
                       :attribution => copyright,
-                      :maxZoom => max_zoom)
-  end
-
-  file "remove old layer yaml" do
-    if new_resource.overlay
-      path "/srv/imagery/layers/#{site}/#{layer}.yml" # remove layer if overlay
-    else
-      path "/srv/imagery/overlays/#{site}/#{layer}.yml" # remove overlay if layer
-    end
-    action :delete
+                      :default => default_layer,
+                      :maxZoom => max_zoom,
+                      :overlay => overlay)
   end
 
   template "/srv/imagery/mapserver/layer-#{layer}.map" do
@@ -77,7 +67,9 @@ 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_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"
@@ -130,5 +122,5 @@ end
 
 def after_created
   notifies :create, "imagery_site[#{site}]"
-  notifies :restart, "service[nginx]"
+  notifies :reload, "service[nginx]"
 end