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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 0416e2e5b..ec62ae45a 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -25,28 +25,31 @@ 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++"
 
 package "sqlite3"
 package "osmosis"
 package "curl"
-package "m4"
-package "subversion"
+package "pbzip2"
 
-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"
@@ -56,19 +59,26 @@ template "/etc/cron.d/taginfo" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
-  mode 0755
+  mode 0o755
 end
 
 file "/etc/logrotate.d/taginfo" do
   action :delete
 end
 
+template "/etc/sudoers.d/taginfo" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0o440
+end
+
 node[:taginfo][:sites].each do |site|
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
@@ -80,19 +90,27 @@ node[:taginfo][:sites].each do |site|
   directory "/var/log/taginfo/#{name}" do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
   directory directory do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   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.8.0"
+    user "taginfo"
+    group "taginfo"
+  end
+
+  git "#{directory}/osmium-tool" do
+    action :sync
+    repository "git://github.com/osmcode/osmium-tool.git"
+    revision "v1.3.1"
     user "taginfo"
     group "taginfo"
   end
@@ -117,12 +135,12 @@ 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"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
-    settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
-    settings["tagstats"]["geodistribution"] = "MmapAnon"
+    settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
+    settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
+    settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     JSON.pretty_generate(settings)
   end
@@ -130,8 +148,9 @@ node[:taginfo][:sites].each do |site|
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
     content settings
+    notifies :restart, "service[apache2]"
   end
 
   execute "#{directory}/taginfo/tagstats/Makefile" do
@@ -140,16 +159,33 @@ 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
+  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]"
+  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"
       group "taginfo"
-      mode 0755
+      mode 0o755
     end
   end
 
@@ -158,27 +194,27 @@ node[:taginfo][:sites].each do |site|
     source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/planet/replication/configuration.txt" do
     source "configuration.txt.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   file "#{directory}/planet/replication/download.lock" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/bin/update-planet" do
     source "update-planet.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -186,7 +222,7 @@ node[:taginfo][:sites].each do |site|
     source "update-taginfo.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -194,7 +230,7 @@ node[:taginfo][:sites].each do |site|
     source "update.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :name => name, :directory => directory
   end