From: Grant Slater <git@firefishy.com>
Date: Fri, 3 Jun 2016 20:55:20 +0000 (+0100)
Subject: imagery: remove remnants of overlay yml
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d5e6ae801dfff473efe2701e560442d21289c549

imagery: remove remnants of overlay yml
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index bfcfd3424..88e26cf2e 100644
--- 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 a2c94b953..2cf26011c 100644
--- 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