Use default sandboxing for the blogs-update service

[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 1a8a01a26b190ebff4fbe4082eccb8503d2e066b..3a023d6b2bb71ee85d372997ab1f39522f92a2f9 100644 (file)
--- a/cookbooks/tile/templates/default/expire-tiles.erb
+++ b/cookbooks/tile/templates/default/expire-tiles.erb
@@ -2,17 +2,14 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-require 'expire'
-
-tile_dirs = [
+args = [

 <% node[:tile][:styles].each do |name,details| -%>
 <% node[:tile][:styles].each do |name,details| -%>

-  "/srv/tile.openstreetmap.org/tiles/<%= name %>",
+  "-t", "/srv/tile.openstreetmap.org/tiles/<%= name %>",

 <% end -%>
 <% 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 %>
-
-Dir.glob("/var/lib/replicate/expire-queue/changes-*.gz").each do |f|
-   Expire::expire(f, 13, max_zoom, tile_dirs)
-   File::unlink(f)
+Dir.glob("/var/lib/replicate/expire-queue/changes-*.gz").sort.each do |f|
+   system("/usr/local/bin/expire-tiles-single", *args, f) && File::unlink(f)

 end
 end