Use system package for osmosis

diff --git a/cookbooks/planet/files/default/bin/planet2pbf b/cookbooks/planet/files/default/bin/planet2pbf
index 3c2c807f2b3ab95dc5c1bff18ef296afa16f2262..d7003d5ae1ae9b42bb00ea4e96847bf94316f363 100755 (executable)
--- a/cookbooks/planet/files/default/bin/planet2pbf
+++ b/cookbooks/planet/files/default/bin/planet2pbf
@@ -54,7 +54,7 @@ then
        fi
        JAVACMD_OPTIONS=-Xmx2048M
        export JAVACMD_OPTIONS
-       pbzip2 -dc /store/planet/planet/${YEARFULL}/${planet}.bz2 | /home/grant/code/osmosis-0.43/bin/osmosis --read-xml - --buffer bufferCapacity=18000 --write-pbf /store/planet/pbf/${planet}.pbf
+       pbzip2 -dc /store/planet/planet/${YEARFULL}/${planet}.bz2 | osmosis --read-xml - --buffer bufferCapacity=18000 --write-pbf /store/planet/pbf/${planet}.pbf
        cd /store/planet/pbf/
        md5sum ${planet}.pbf >${planet}.pbf.md5
        ln -fs ${planet}.pbf planet-latest.osm.pbf

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 5cfdf541691f1654e34b45ef0757c9108c7dce62..cb2ff26f30b61e379b59e23efcf2b00ef2b06463 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache::ssl"
 
 package "perl"
 package "php5-cli"
+package "osmosis"
 
 remote_directory "/usr/local/bin" do
   source "bin"