X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/741593ee2bf203c9261f604d094e3d8e621698a8..5749efa8b2023bb1ee06ffccf370938eaf550bc2:/cookbooks/imagery/resources/layer.rb?ds=inline diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index f8d3b1aa1..4575991a8 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -19,11 +19,13 @@ require "yaml" +unified_mode true + default_action :create property :layer, String, :name_property => true property :site, String, :required => true -property :source, String, :required => true +property :source, String, :required => [:create] property :root_layer, [true, false], :default => false property :title, String property :copyright, String, :default => "Copyright" @@ -39,15 +41,16 @@ 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 owner "root" group "root" - mode 0o644 + 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, @@ -59,24 +62,15 @@ action :create do source "mapserver.map.erb" owner "root" group "root" - mode 0o644 + 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 owner "root" group "root" - mode 0o755 + mode "755" recursive true end @@ -85,7 +79,7 @@ action :create do source "nginx_imagery_layer_fragment.conf.erb" owner "root" group "root" - mode 0o644 + mode "644" variables new_resource.to_hash end end @@ -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 @@ -114,6 +100,5 @@ end def after_created notifies :create, "imagery_site[#{site}]" - notifies :reload, "service[nginx]" - # notifies :restart, "service[mapserv-fcgi-#{site}]" + notifies :restart, "service[nginx]" end