Tidy up a few things in the planetdump script

[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 068ce5d5fd09d0f0d85d14ac1cd1311af506382c..b2b2a6ea4eb7bb4f32ac81bd5680fd0c57448c5d 100644 (file)
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -1,17 +1,20 @@
 #!/bin/bash
 
+# DO NOT EDIT - This file is being maintained by Chef
+
 # Exit on error
 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 date from the file name
-date="${BASH_REMATCH[1]}"
+# Save the year and date from the file name
+year="${BASH_REMATCH[1]}"
+date="${year}-${BASH_REMATCH[2]}"
 
 # Check the lock
 if [ -f /tmp/planetdump.lock ]; then
@@ -26,6 +29,14 @@ fi
 # Create Lock
 echo $$ > /tmp/planetdump.lock
 
+# Define cleanup function
+function cleanup {
+    rm /tmp/planetdump.lock
+}
+
+# Remove lock on exit
+trap cleanup EXIT
+
 # Change to working directory
 cd /store/planetdump
 
@@ -44,18 +55,13 @@ 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
+<% {
+    "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 -%>