imagery: add additional gb_os_sv_diff layers

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index d2aa62a34f33946285a7659589a0407a51186dd4..b9ffd67727f672e9b84067d94322f3dd6857c6cd 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -40,24 +40,23 @@ property :revision, Fixnum, :default => 1
 property :overlay, [TrueClass, FalseClass], :default => false
 
 action :create do
 property :overlay, [TrueClass, FalseClass], :default => false
 
 action :create do

-

   file "create layer yaml definition" do
     owner "root"
     group "root"
     mode 0644
   file "create layer yaml definition" do
     owner "root"
     group "root"
     mode 0644

-    if @overlay
+    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,
       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}.#{extension}",
+                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",

                       :attribution => copyright,
                       :maxZoom => max_zoom)
   end
 
   file "remove old layer yaml" do
                       :attribution => copyright,
                       :maxZoom => max_zoom)
   end
 
   file "remove old layer yaml" do

-    if @overlay
+    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
       path "/srv/imagery/layers/#{site}/#{layer}.yml" # remove layer if overlay
     else
       path "/srv/imagery/overlays/#{site}/#{layer}.yml" # remove overlay if layer