Fix path to planet-dump-ng

[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 4d5bac02ce64c61e90de2214ab8a8f828b3dfb1e..f88a4ff6b335e812953ee210d6374fe9f3cb9440 100644 (file)
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -1,17 +1,20 @@
 #!/bin/bash
 
 #!/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"
 # 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
 
 
 # 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
 
 # Check the lock
 if [ -f /tmp/planetdump.lock ]; then


@@ -26,9 +29,9 @@ fi
 # Create Lock
 echo $$ > /tmp/planetdump.lock
 
 # Create Lock
 echo $$ > /tmp/planetdump.lock
 

+# Define cleanup function

 function cleanup {
 function cleanup {

-        # Release lock
-        rm /tmp/planetdump.lock
+    rm /tmp/planetdump.lock

 }
 
 # Remove lock on exit
 }
 
 # Remove lock on exit


@@ -45,22 +48,20 @@ rm -rf ways way_tags way_nodes
 rm -rf relations relation_tags relation_members
 
 # Run the dump
 rm -rf relations relation_tags relation_members
 
 # Run the dump

-time nice -n 19 /store/planet-dump-ng/planet-dump-ng \
+time nice -n 19 /opt/planet-dump-ng/planet-dump-ng \

      -c "pbzip2 -c" -f "${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"
 
 # Move XML dumps into place
      -c "pbzip2 -c" -f "${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"
 
 # 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
+<% {
+    "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 -%>