Taginfo: get osmium-tool from git and compile it.
authorJochen Topf <jochen@topf.org>
Sun, 22 Nov 2015 16:51:32 +0000 (17:51 +0100)
committerJochen Topf <jochen@topf.org>
Sun, 22 Nov 2015 16:51:32 +0000 (17:51 +0100)
cookbooks/taginfo/recipes/default.rb

index 8650b21c7647c37d9ae95112b837aa9c7eb81b80..a33c97b1cf73dd1df8ebd38c87c9521334600506 100644 (file)
@@ -105,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"
@@ -157,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"