Remove remnants of old osmium from taginfo recipe.

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index c42bfdcece57d50e9aa9743ba6ef42eb89ae91a0..a4e6c4966c06a7852a63cbced8f3a813a8e81e5b 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -26,8 +26,6 @@ include_recipe "git"
 package "libsqlite3-dev"
 package "zlib1g-dev"
 package "libbz2-dev"
-package "libosmpbf-dev"
-package "libprotobuf-dev"
 package "libboost-dev"
 package "libexpat1-dev"
 package "libsparsehash-dev"
@@ -98,10 +96,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
@@ -131,8 +129,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?"
 
@@ -153,7 +151,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