Use chef 14 to run tests

[chef.git] / cookbooks / planet / templates / default / planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index 3670c72a0e1365a0fba5a8a581a809cb894ab079..15a0051910152841cb635e898e8e7294b5e4d111 100644 (file)
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -60,7 +60,7 @@ cd /store/planetdump
 
 # Cleanup
 rm -rf users
-rm -rf changesets changeset_tags
+rm -rf changesets changeset_tags changeset_comments
 rm -rf nodes node_tags
 rm -rf ways way_tags way_nodes
 rm -rf relations relation_tags relation_members
@@ -69,6 +69,7 @@ rm -rf relations relation_tags relation_members
 time nice -n 19 /opt/planet-dump-ng/planet-dump-ng \
      -c "pbzip2 -c" -f "/store/backup/${file}" --dense-nodes=1 \
      -C "changesets-${date}.osm.bz2" \
+     -D "discussions-${date}.osm.bz2" \
      -x "planet-${date}.osm.bz2" -X "history-${date}.osm.bz2" \
      -p "planet-${date}.osm.pbf" -P "history-${date}.osm.pbf"
 
@@ -91,7 +92,11 @@ function install_dump {
 
 # Move dumps into place
 install_dump "changesets" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
+install_dump "discussions" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
 install_dump "planet" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
 install_dump "history" "bz2" "<%= node[:planet][:dump][:xml_history_directory] %>" "${year}"
 install_dump "planet" "pbf" "<%= node[:planet][:dump][:pbf_directory] %>"
 install_dump "history" "pbf" "<%= node[:planet][:dump][:pbf_history_directory] %>"
+
+# Remove pbf dumps older than 90 days
+find "<%= node[:planet][:dump][:pbf_directory] %>" "<%= node[:planet][:dump][:pbf_history_directory] %>" -maxdepth 1 -mindepth 1 -type f -mtime +90 \( -iname 'planet-*.pbf' -o -iname 'history-*.pbf' -o -iname 'planet-*.pbf.md5' -o -iname 'history-*.pbf.md5' \) -delete