X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b0c412752eb8b1b15afaee92ec0be2fb42d7ad23..2f9232e7fc3d9f1cbcd882c7379d56a0686ec5e7:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index ae6c01eec..43e45e2ac 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -25,12 +25,12 @@ 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 "make"
 package "g++"
 
@@ -38,7 +38,6 @@ package "sqlite3"
 package "osmosis"
 package "curl"
 package "m4"
-package "subversion"
 
 package "ruby#{node[:passenger][:ruby_version]}"
 package "rubygems#{node[:passenger][:ruby_version]}"
@@ -96,10 +95,10 @@ 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.2"
     user "taginfo"
     group "taginfo"
   end
@@ -129,8 +128,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?"
 
@@ -151,7 +150,7 @@ 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