X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da798ac5fefecf2084f8cd9b3cc31fca5d02176a..d5a85e00136bfbedcd488bbe9c93f5752bf1a106:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 4d9efdefd..c1c428290 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -39,7 +39,6 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
-package "m4"
 
 ruby_version = node[:passenger][:ruby_version]
 
@@ -102,7 +101,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.5.3"
+    revision "v2.6.1"
     user "taginfo"
     group "taginfo"
   end
@@ -139,10 +138,8 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["create"] = "db languages projects wiki"
     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../../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?"
 
     JSON.pretty_generate(settings)
@@ -172,8 +169,6 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
     mode "0755"
     action :create
-    subscribes :create, "git[#{directory}/libosmium]"
-    subscribes :create, "git[#{directory}/osmium-tool]"
   end
 
   execute "compile-osmium" do
@@ -184,7 +179,6 @@ node[:taginfo][:sites].each do |site|
     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|