X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/87daa0d823c8f92eda8190f2d9b482b3d85a7a0c..b7c12630cb9de017d76fe60ff296534d6d061399:/cookbooks/imagery/resources/layer.rb?ds=inline diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 2cc90df56..4575991a8 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -19,6 +19,8 @@ require "yaml" +unified_mode true + default_action :create property :layer, String, :name_property => true @@ -39,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 @@ -47,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, @@ -61,16 +64,7 @@ action :create do group "root" mode "644" variables new_resource.to_hash - end - - # Disable legacy service - service "mapserv-fcgi-#{new_resource.layer}" do - action [:stop, :disable] - end - - # Remove legacy service - systemd_service "mapserv-fcgi-#{new_resource.layer}" do - action :delete + not_if { new_resource.uses_tiler } end directory "/srv/imagery/nginx/#{new_resource.site}" do @@ -95,18 +89,10 @@ action :delete do action :delete end - service "mapserv-fcgi-layer-#{new_resource.layer}" do - action [:stop, :disable] - end - file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do action :delete end - systemd_service "mapserv-fcgi-#{new_resource.layer}" do - action :delete - end - file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do action :delete end