Merge remote-tracking branch 'github/pull/118'

diff --git a/cookbooks/tile/templates/default/expire-tiles.erb b/cookbooks/tile/templates/default/expire-tiles.erb
index 6716fd66c2597cf194220e7de9a8cf9379535f42..1a8a01a26b190ebff4fbe4082eccb8503d2e066b 100644 (file)
--- a/cookbooks/tile/templates/default/expire-tiles.erb
+++ b/cookbooks/tile/templates/default/expire-tiles.erb
@@ -12,7 +12,7 @@ tile_dirs = [
 
 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|
+Dir.glob("/var/lib/replicate/expire-queue/changes-*.gz").each do |f|
    Expire::expire(f, 13, max_zoom, tile_dirs)
    File::unlink(f)
 end

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index ecc6b69b036fd79dcf977c61b2afe1de4c8eb5b5..9d86d9534b0bd198140fcffc3ce4b7bafbd45df2 100644 (file)
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -28,7 +28,7 @@ trap onexit EXIT
 while true
 do
     # Work out the name of the next file
-    file="changes-${sequenceNumber}.osm.gz"
+    file="changes-${sequenceNumber}.osc.gz"
 
     # Save state file so we can rollback if an error occurs
     cp state.txt state-prev.txt