X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d8fc1ec5f984b7ab6a7886e054c9dd272d3678b1..0d8030b3a7ec9eaa6bc96c7dd39d835a00a7ace0:/cookbooks/tile/templates/default/expire-tiles.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/expire-tiles.erb b/cookbooks/tile/templates/default/expire-tiles.erb index 2c0e7406e..2f6a97d77 100644 --- a/cookbooks/tile/templates/default/expire-tiles.erb +++ b/cookbooks/tile/templates/default/expire-tiles.erb @@ -2,16 +2,14 @@ # DO NOT EDIT - This file is being maintained by Chef -require 'expire' - -tile_dirs = [ +args = [ <% node[:tile][:styles].each do |name,details| -%> - "/srv/tile.openstreetmap.org/tiles/<%= name %>", + "-t", "/srv/tile.openstreetmap.org/tiles/<%= name %>", <% end -%> + "--min", "13", + "--max", "<%= node[:tile][:styles].collect { |n,d| d[:max_zoom] }.max %>" ] -max_zoom = <%= node[:tile][:styles].collect { |n,d| d[:max_zoom] }.max %> - -ARGV.each do |f| - Expire::expire(f, 13, max_zoom, tile_dirs) +Dir.glob("/var/lib/replicate/expire-queue/changes-*.gz").each do |f| + system("/usr/local/bin/expire-tiles-single", *args, f) && File::unlink(f) end