]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/taginfo/recipes/default.rb
Install taginfo gems using the correct gem binary
[chef.git] / cookbooks / taginfo / recipes / default.rb
index 23589a6ba34af07b3ed42a7293cdbbb3cf59220a..4d9efdefde5959c2df95163512e2c3a0116e7cb7 100644 (file)
@@ -25,13 +25,14 @@ include_recipe "git"
 
 package "libsqlite3-dev"
 package "zlib1g-dev"
-package "libosmpbf-dev"
-package "libprotobuf-dev"
+package "libbz2-dev"
 package "libboost-dev"
 package "libexpat1-dev"
 package "libsparsehash-dev"
 package "libgd2-xpm-dev"
 package "libicu-dev"
+package "libboost-program-options-dev"
+package "cmake"
 package "make"
 package "g++"
 
@@ -39,15 +40,16 @@ package "sqlite3"
 package "osmosis"
 package "curl"
 package "m4"
-package "subversion"
 
-package "ruby#{node[:passenger][:ruby_version]}"
-package "rubygems#{node[:passenger][:ruby_version]}"
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
+ruby_version = node[:passenger][:ruby_version]
+
+package "ruby#{ruby_version}"
+
+%w(json sqlite3 sinatra sinatra-r18n rack-contrib).each do |gem|
+  gem_package gem do
+    gem_binary "gem#{ruby_version}"
+  end
+end
 
 apache_module "cache"
 apache_module "cache_disk"
@@ -97,10 +99,18 @@ node[:taginfo][:sites].each do |site|
     mode 0755
   end
 
-  git "#{directory}/osmium" do
+  git "#{directory}/libosmium" do
     action :sync
-    repository "git://github.com/joto/osmium.git"
-    revision "osmorg-taginfo-live"
+    repository "git://github.com/osmcode/libosmium.git"
+    revision "v2.5.3"
+    user "taginfo"
+    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
@@ -130,8 +140,8 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
     settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
     settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
-    settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
-    settings["tagstats"]["geodistribution"] = "MmapAnon"
+    settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
+    settings["tagstats"]["geodistribution"] = "DenseMmapArray"
     settings["user_interface"]["key_page"]["show_tab_similar"] = true
     settings["level0"]["overpass_url_prefix"] = "http://overpass-api.de/api/interpreter?"
 
@@ -152,11 +162,31 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "git[#{directory}/osmium]"
+    subscribes :run, "git[#{directory}/libosmium]"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "service[apache2]"
   end
 
+  directory "#{directory}/osmium-tool/build" do
+    owner "taginfo"
+    group "taginfo"
+    mode "0755"
+    action :create
+    subscribes :create, "git[#{directory}/libosmium]"
+    subscribes :create, "git[#{directory}/osmium-tool]"
+  end
+
+  execute "compile-osmium" do
+    action :nothing
+    command "cmake .. && make"
+    cwd "#{directory}/osmium-tool/build"
+    user "taginfo"
+    group "taginfo"
+    subscribes :run, "git[#{directory}/libosmium]"
+    subscribes :run, "git[#{directory}/osmium-tool]"
+    subscribes :run, "directory[#{directory}/osmium-tool/build]"
+  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"