imagery: switch to volume mount for imagery

[chef.git] / cookbooks / tile / templates / default / update-lowzoom.erb

diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb
index 291e9a8d50804e63c7c051b4c6eaa3f3b4b699b6..0455493d993bc2f2a2830d63eab95228fc84a4b4 100644 (file)
--- a/cookbooks/tile/templates/default/update-lowzoom.erb
+++ b/cookbooks/tile/templates/default/update-lowzoom.erb
@@ -5,28 +5,28 @@
 # Send output to the log
 exec > /var/log/tile/update-lowzoom-<%= @style %>.log 2>&1
 
-# Update tiles from z0 to z10 for style "<%= @style %>"
-render_list \
-  --all --force \
-  --tile-dir=/srv/tile.openstreetmap.org/tiles \
-  --socket=/var/run/renderd/renderd.sock \
-  --num-threads=<%= ( node[:cpu][:total] - 2 ) / 4 %> \
-  --map="<%= @style %>" \
-  --max-load=70 \
-  --min-zoom=0 --max-zoom=10
+# Define function to update tiles from z0 to z12 for style "<%= @style %>"
+function update_tiles
+{
+  render_old \
+    --timestamp=$(stat -c %Y "/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml") \
+    --tile-dir=/srv/tile.openstreetmap.org/tiles \
+    --socket=/var/run/renderd/renderd.sock \
+    --num-threads=<%= @threads %> \
+    --map="<%= @style %>" \
+    --max-load=<%= node.cpu_cores - 1 %> \
+    --min-zoom=0 --max-zoom=12
+}
+
+# Loop running the update command until it suceeds
+until update_tiles
+do
+  sleep 30
+done
 
 # Update timestamp for style "<%= @style %>"
 touch \
   --reference="/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml" \
   "/srv/tile.openstreetmap.org/tiles/<%= @style %>/planet-import-complete"
 
-# Update tiles from z11 to z12 for style "<%= @style %>"
-render_old \
-  --tile-dir=/srv/tile.openstreetmap.org/tiles \
-  --socket=/var/run/renderd/renderd.sock \
-  --num-threads=<%= ( node[:cpu][:total] - 2 ) / 4 %> \
-  --map="<%= @style %>" \
-  --max-load=70 \
-  --min-zoom=11 --max-zoom=12
-
 exit 0