X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a08c8d97d5cd3666799fb3bef14618d4c7c23398..f50bf1e0e5e650b93d4714b7e2389e662d0dc3a4:/cookbooks/imagery/resources/layer.rb?ds=sidebyside diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index dc1fd51bb..4575991a8 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -41,6 +41,7 @@ property :url_aliases, [String, Array], :default => [] property :revision, Integer, :default => 0 property :overlay, [true, false], :default => false property :default_layer, [true, false], :default => false +property :uses_tiler, [true, false], :default => false action :create do file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do @@ -49,7 +50,7 @@ action :create do mode "644" content YAML.dump(:name => new_resource.layer, :title => new_resource.title || new_resource.layer, - :url => "//{s}.#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.png", + :url => "//#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.#{new_resource.extension}".gsub(/\.(os_sv_png|os_sv_diff_png|os_om_local_png)$/, ".png"), :attribution => new_resource.copyright, :default => new_resource.default_layer, :maxZoom => new_resource.max_zoom, @@ -63,6 +64,7 @@ action :create do group "root" mode "644" variables new_resource.to_hash + not_if { new_resource.uses_tiler } end directory "/srv/imagery/nginx/#{new_resource.site}" do