X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/49e848652d7455d006e2f90c1fc54cfdbba8afcf..37c0446fb32977edfa5647799a62bde3256a6d32:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 418bb604a..76a869b7c 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -39,15 +39,17 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
-package "m4"
+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"
@@ -57,13 +59,13 @@ 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
@@ -74,7 +76,7 @@ template "/etc/sudoers.d/taginfo" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 node[:taginfo][:sites].each do |site|
@@ -88,19 +90,19 @@ 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}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.5.3"
+    revision "v2.10.3"
     user "taginfo"
     group "taginfo"
   end
@@ -108,14 +110,14 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium-tool" do
     action :sync
     repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.3.0"
+    revision "v1.4.1"
     user "taginfo"
     group "taginfo"
   end
 
   git "#{directory}/taginfo" do
     action :sync
-    repository "git://github.com/joto/taginfo.git"
+    repository "git://github.com/taginfo/taginfo.git"
     revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
@@ -137,11 +139,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)
   end
@@ -149,7 +148,7 @@ 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
@@ -165,10 +164,17 @@ node[:taginfo][:sites].each do |site|
     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 "mkdir build && cd build && cmake .. && make"
-    cwd "#{directory}/osmium-tool"
+    command "cmake .. && make"
+    cwd "#{directory}/osmium-tool/build"
     user "taginfo"
     group "taginfo"
     subscribes :run, "git[#{directory}/libosmium]"
@@ -179,7 +185,7 @@ node[:taginfo][:sites].each do |site|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
-      mode 0755
+      mode 0o755
     end
   end
 
@@ -188,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
 
@@ -216,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
 
@@ -224,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