X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ea0715b4be41a1d1600bba7a1f5d0b988708579f..10d6c4be7d58819dd15d4c064eb2ced47a2536d0:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 0416e2e5b..840eea129 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -25,12 +25,14 @@ 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"
 package "libgd2-xpm-dev"
+package "libicu-dev"
 package "make"
 package "g++"
 
@@ -69,6 +71,13 @@ file "/etc/logrotate.d/taginfo" do
   action :delete
 end
 
+template "/etc/sudoers.d/taginfo" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0440
+end
+
 node[:taginfo][:sites].each do |site|
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
@@ -89,10 +98,18 @@ node[:taginfo][:sites].each do |site|
     mode 0755
   end
 
-  git "#{directory}/osmium" do
+#  git "#{directory}/osmium" do
+#    action :sync
+#    repository "git://github.com/joto/osmium.git"
+#    revision "osmorg-taginfo-live"
+#    user "taginfo"
+#    group "taginfo"
+#  end
+
+  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
@@ -117,12 +134,17 @@ node[:taginfo][:sites].each do |site|
     settings["logging"]["directory"] = "/var/log/taginfo/#{name}"
     settings["opensearch"]["shortname"] = "Taginfo"
     settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
-    settings["sources"]["download"] = "josm"
-    settings["sources"]["create"] = "db languages potlatch projects wiki"
+    settings["sources"]["download"] = ""
+    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../../osmium/include"
-    settings["tagstats"]["geodistribution"] = "MmapAnon"
+#    settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
+    settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
+#    settings["tagstats"]["geodistribution"] = "MmapAnon"
+    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)
   end
@@ -132,6 +154,7 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
     mode 0644
     content settings
+    notifies :restart, "service[apache2]"
   end
 
   execute "#{directory}/taginfo/tagstats/Makefile" do
@@ -140,7 +163,8 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "git[#{directory}/osmium]"
+#    subscribes :run, "git[#{directory}/osmium]"
+    subscribes :run, "git[#{directory}/libosmium]"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "service[apache2]"
   end