X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/87daa0d823c8f92eda8190f2d9b482b3d85a7a0c..bdc04df9569ce17679b057fca2dbd4bca35b1096:/cookbooks/imagery/resources/layer.rb?ds=inline diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 2cc90df56..7a376fdd1 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 @@ -47,7 +49,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}.png", :attribution => new_resource.copyright, :default => new_resource.default_layer, :maxZoom => new_resource.max_zoom, @@ -63,16 +65,6 @@ action :create do 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 - end - directory "/srv/imagery/nginx/#{new_resource.site}" do owner "root" group "root" @@ -95,18 +87,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