Use .osc.gz for diffs that tile replication fetches

[chef.git] / cookbooks / tile / templates / default / expire-tiles.erb

diff --git a/cookbooks/tile/templates/default/expire-tiles.erb b/cookbooks/tile/templates/default/expire-tiles.erb
index e9473a1a7badc3b8057dd59453549887c85a07df..6716fd66c2597cf194220e7de9a8cf9379535f42 100644 (file)
--- a/cookbooks/tile/templates/default/expire-tiles.erb
+++ b/cookbooks/tile/templates/default/expire-tiles.erb
@@ -4,6 +4,15 @@
 
 require 'expire'
 
-ARGV.each do |f|
-   Expire::expire(f)
+tile_dirs = [
+<% node[:tile][:styles].each do |name,details| -%>
+  "/srv/tile.openstreetmap.org/tiles/<%= name %>",
+<% end -%>
+]
+
+max_zoom = <%= node[:tile][:styles].collect { |n,d| d[:max_zoom] }.max %>
+
+Dir.glob("/var/lib/replicate/expire-queue/changes-*.osm.gz").each do |f|
+   Expire::expire(f, 13, max_zoom, tile_dirs)
+   File::unlink(f)
 end