X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cd507bd2203f95ea8af4faf6c3128bd6df2b4666..063bfb7e0473de34b947b867d4d0c490540b4fc9:/cookbooks/planet/templates/default/planetdump.erb?ds=sidebyside

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index 068ce5d5f..a8fd4aa9f 100644
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -1,4 +1,5 @@
 #!/bin/bash
+# DO NOT EDIT - This file is being maintained by Chef
 
 # Exit on error
 set -e
@@ -26,6 +27,14 @@ fi
 # Create Lock
 echo $$ > /tmp/planetdump.lock
 
+function cleanup {
+	 # Release lock
+	 rm /tmp/planetdump.lock
+}
+
+# Remove lock on exit
+trap cleanup EXIT
+
 # Change to working directory
 cd /store/planetdump
 
@@ -44,18 +53,14 @@ time nice -n 19 /store/planet-dump-ng/planet-dump-ng \
      -p "planet-${date}.osm.pbf" -P "history-${date}.osm.pbf"
 
 # Move XML dumps into place
-for file in "changesets-${date}.osm.bz2" "planet-${date}.osm.bz2" "history-${date}.osm.bz2"
-do
-    md5sum "#{file}" > "#{file}.md5"
-    mv "${file}" "${file}.md5" "/store/planet/planet"
-done
-
-# Move PBF dumps into place
-for file in "planet-${date}.osm.pbf" "history-${date}.osm.pbf"
-do
-    md5sum "#{file}" > "#{file}.md5"
-    mv "${file}" "${file}.md5" "/store/planet/pbf"
-done
-
-# Release lock
-rm /tmp/planetdump.lock
+year = `echo ${date} | sed "s/.*-\([0-9]\)\{4\}-.*/\1/"`
+<% {
+	 "changesets-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_directory]}/${year}",
+	 "planet-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_directory]}/${year}",
+	 "history-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_history_directory]}/${year}",
+	 "planet-${date}.osm.pbf" => node[:planet][:dump][:pbf_directory],
+	 "history-${date}.osm.pbf" => node[:planet][:dump][:pbf_history_directory]
+}.each do |file,dir| %>
+md5sum "<%= file %>" > "<%= file %>.md5"
+mv "<%= file %>" "<%= file %>.md5" "<%= dir %>"
+<% end %>