From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Jun 2013 20:30:26 +0000 (+0100)
Subject: Use system package for osmosis
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/98365f1da1424a74d5e1a562f0885608fadb88e7

Use system package for osmosis
---

diff --git a/cookbooks/planet/files/default/bin/planet2pbf b/cookbooks/planet/files/default/bin/planet2pbf
index 3c2c807f2..d7003d5ae 100755
--- 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 5cfdf5416..cb2ff26f3 100644
--- 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"