X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/90f61f02af30dcf19266d103048b96c576b691fd..bed7db240ce3f7e9dcd7c3532f3a0e5a0afdf015:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index c76956354..89489f5bd 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -188,21 +188,6 @@ node[:tile][:data].each_value do |data| end end - if data[:processed] - original = "#{directory}/#{data[:original]}" - processed = "#{directory}/#{data[:processed]}" - - package "gdal-bin" - - execute processed do - action :nothing - command "ogr2ogr #{processed} #{original}" - user "tile" - group "tile" - subscribes :run, "execute[#{file}]", :immediately - end - end - execute "#{file}_shapeindex" do action :nothing command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files" @@ -215,6 +200,7 @@ node[:tile][:data].each_value do |data| if data[:refresh] action :create use_conditional_get true + ignore_failure true else action :create_if_missing end @@ -404,7 +390,6 @@ package "libxml2-dev" gem_package "proj4rb" gem_package "libxml-ruby" -gem_package "simple-mmap" remote_directory "/usr/local/lib/site_ruby" do source "ruby"