X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/932f7a837e84c5c29fd8429a574dd7aea5314b0a..8771d94d8bfd599356ab8a6f697289a26788a9b3:/cookbooks/planet/templates/default/planetdump.erb diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb index fbadac8b9..d60de2b5b 100644 --- a/cookbooks/planet/templates/default/planetdump.erb +++ b/cookbooks/planet/templates/default/planetdump.erb @@ -23,7 +23,7 @@ cur_planet=planet-${cur_date}.osm cur_changeset=changesets-${cur_date}.osm planet_dir=/store/planet/ -export CONNECTION_PARAMS='dbname=openstreetmap host=localhost user=planetdump password=<%= @password %>' +export CONNECTION_PARAMS='dbname=openstreetmap host=db-slave user=planetdump password=<%= @password %>' export PATH='/usr/local/bin:/usr/bin:/bin:/usr/bin/X11' @@ -35,16 +35,16 @@ if [ \! -d ${planet_dir}/planet/ ] if [ \! -d ${planet_dir}/planet/${cur_year}/ ]; then mkdir ${planet_dir}/planet/${cur_year}/; fi cd ${planet_dir}/planet/${cur_year}/ -/opt/planetdump/planet06_pg | pbzip2 -p6 -7c > .${cur_planet}.bz2.new +/opt/planetdump/planet06_pg | pbzip2 -p6 -6c > .${cur_planet}.bz2.new /opt/planetdump/planet06_pg --changesets | pbzip2 -p6 -9c > .${cur_changeset}.bz2.new planet_size=$(du -sb .${cur_planet}.bz2.new | awk '{ print $1 }') changeset_size=$(du -sb .${cur_changeset}.bz2.new | awk '{ print $1 }') -if ((planet_size<28000000000)); then +if ((planet_size<32000000000)); then echo Planet .${cur_planet}.bz2.new too small exit 1 fi -if ((changeset_size<600000000)); then +if ((changeset_size<720000000)); then echo Changeset .${cur_changeset}.bz2.new too small exit 1 fi