imagery: remove remnants of overlay yml

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index bfcfd3424ebe5bd9b27139835a34f27f4117af01..88e26cf2e19c9d12ee4b40393e6f38f5067b7a78 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -54,11 +54,6 @@ action :create do
                       :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"

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index a2c94b95399173f69dabd7b99ece160f82b50587..2cf26011c43ca0da4af0d1ba5c7423e1ba74d022 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -66,16 +66,12 @@ action :create do
     YAML.load(::File.read(path))
   end
 
-  overlays = Dir.glob("/srv/imagery/overlays/#{name}/*.yml").collect do |path|
-    YAML.load(::File.read(path))
-  end
-
   template "/srv/#{name}/imagery.js" do
     source "imagery.js.erb"
     user "root"
     group "root"
     mode 0644
-    variables :bbox => bbox, :layers => layers, :overlays => overlays
+    variables :bbox => bbox, :layers => layers
   end
 
   nginx_site name do