Taginfo: get osmium-tool from git and compile it.

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index a4e6c4966c06a7852a63cbced8f3a813a8e81e5b..a33c97b1cf73dd1df8ebd38c87c9521334600506 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -31,6 +31,8 @@ package "libexpat1-dev"
 package "libsparsehash-dev"
 package "libgd2-xpm-dev"
 package "libicu-dev"
+package "libboost-program-options-dev"
+package "cmake"
 package "make"
 package "g++"
 
@@ -38,7 +40,6 @@ package "sqlite3"
 package "osmosis"
 package "curl"
 package "m4"
-package "subversion"
 
 package "ruby#{node[:passenger][:ruby_version]}"
 package "rubygems#{node[:passenger][:ruby_version]}"
@@ -104,6 +105,14 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
   end
 
+  git "#{directory}/osmium-tool" do
+    action :sync
+    repository "git://github.com/osmcode/osmium-tool.git"
+    revision "v1.3.0"
+    user "taginfo"
+    group "taginfo"
+  end
+
   git "#{directory}/taginfo" do
     action :sync
     repository "git://github.com/joto/taginfo.git"
@@ -156,6 +165,16 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "service[apache2]"
   end
 
+  execute "compile-osmium" do
+    action :nothing
+    command "mkdir build && cd build && cmake .. && make"
+    cwd "#{directory}/osmium-tool"
+    user "taginfo"
+    group "taginfo"
+    subscribes :run, "git[#{directory}/libosmium]"
+    subscribes :run, "git[#{directory}/osmium-tool]"
+  end
+
   %w(taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication).each do |dir|
     directory "#{directory}/#{dir}" do
       owner "taginfo"