X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e9d337c2a49d120a8dcb508879d74f6bab5b84d9..1c048ed52745380fcc07c1e44c6bbb34d790dbe7:/cookbooks/planet/templates/default/planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index b2b2a6ea4..8c9eb407b 100644
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -7,14 +7,14 @@ set -e
 
 # Get the name of the file and the expected pattern
 file="$1"
-pattern="^osm-([0-9]{4})-([0-9]{2}-[0-9]{2})\.dmp$"
+pattern="^osm-([0-9]{4})-([0-9]{2})-([0-9]{2})\.dmp$"
 
 # Give up now if the file isn't a database dump
 [[ $file =~ $pattern ]] || exit 0
 
 # Save the year and date from the file name
 year="${BASH_REMATCH[1]}"
-date="${year}-${BASH_REMATCH[2]}"
+date="${year:2:2}${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
 
 # Check the lock
 if [ -f /tmp/planetdump.lock ]; then
@@ -48,8 +48,8 @@ rm -rf ways way_tags way_nodes
 rm -rf relations relation_tags relation_members
 
 # Run the dump
-time nice -n 19 /store/planet-dump-ng/planet-dump-ng \
-     -c "pbzip2 -c" -f "${file}" --dense-nodes=1 \
+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" \
      -x "planet-${date}.osm.bz2" -X "history-${date}.osm.bz2" \
      -p "planet-${date}.osm.pbf" -P "history-${date}.osm.pbf"
@@ -63,5 +63,6 @@ time nice -n 19 /store/planet-dump-ng/planet-dump-ng \
     "history-${date}.osm.pbf" => node[:planet][:dump][:pbf_history_directory]
 }.each do |file,dir| -%>
 md5sum "<%= file %>" > "<%= file %>.md5"
+mkdir -p "<%= dir %>"
 mv "<%= file %>" "<%= file %>.md5" "<%= dir %>"
 <% end -%>