Use packages libosmium and protozero on taginfo server.

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 10b5a7f25fbb39710ca740c95201523ce420aa71..e88b24451846dd18b720fadedc05e7f0e1845d85 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -30,9 +30,11 @@ package %w[
   libboost-dev
   libexpat1-dev
   libsparsehash-dev
-  libgd2-xpm-dev
+  libgd-dev
   libicu-dev
   libboost-program-options-dev
+  libosmium2-dev
+  libprotozero-dev
   cmake
   make
   g++
@@ -40,7 +42,8 @@ package %w[
 
 package %w[
   sqlite3
-  osmosis
+  osmium-tool
+  pyosmium
   curl
   pbzip2
 ]
@@ -49,10 +52,10 @@ 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
+gem_package "bundler#{ruby_version}" do
+  package_name "bundler"
+  gem_binary "gem#{ruby_version}"
+  options "--format-executable"
 end
 
 apache_module "cache"
@@ -85,6 +88,7 @@ end
 
 node[:taginfo][:sites].each do |site|
   site_name = site[:name]
+  site_aliases = Array(site[:aliases])
   directory = site[:directory] || "/srv/#{site_name}"
   description = site[:description]
   about = site[:about]
@@ -103,22 +107,6 @@ node[:taginfo][:sites].each do |site|
     mode 0o755
   end
 
-  git "#{directory}/libosmium" do
-    action :sync
-    repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.12.1"
-    user "taginfo"
-    group "taginfo"
-  end
-
-  git "#{directory}/osmium-tool" do
-    action :sync
-    repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.6.1"
-    user "taginfo"
-    group "taginfo"
-  end
-
   git "#{directory}/taginfo" do
     action :sync
     repository "git://github.com/taginfo/taginfo.git"
@@ -130,7 +118,7 @@ node[:taginfo][:sites].each do |site|
   settings = Chef::DelayedEvaluator.new do
     settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
 
-    settings["instance"]["url"] = "http://#{site_name}/"
+    settings["instance"]["url"] = "https://#{site_name}/"
     settings["instance"]["description"] = description
     settings["instance"]["about"] = about
     settings["instance"]["icon"] = "/img/logo/#{icon}.png"
@@ -143,7 +131,6 @@ 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["tagstats"]["cxxflags"] = "-I../../libosmium/include"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     JSON.pretty_generate(settings)
@@ -163,28 +150,24 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "git[#{directory}/libosmium]"
+    subscribes :run, "package[libprotozero-dev]"
+    subscribes :run, "package[libosmium2-dev]"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "service[apache2]"
   end
 
-  directory "#{directory}/osmium-tool/build" do
-    owner "taginfo"
-    group "taginfo"
-    mode "0755"
-  end
-
-  execute "compile-osmium" do
+  execute "#{directory}/taginfo/Gemfile" 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]"
+    command "bundle#{ruby_version} install"
+    cwd "#{directory}/taginfo"
+    user "root"
+    group "root"
+    subscribes :run, "gem_package[bundler#{ruby_version}]"
+    subscribes :run, "git[#{directory}/taginfo]"
+    notifies :restart, "passenger_application[#{directory}/taginfo/web/public]"
   end
 
-  %w[taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication].each do |dir|
+  %w[taginfo/web/tmp bin data data/old download sources planet planet/log].each do |dir|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
@@ -200,19 +183,6 @@ node[:taginfo][:sites].each do |site|
     mode 0o644
   end
 
-  template "#{directory}/planet/replication/configuration.txt" do
-    source "configuration.txt.erb"
-    owner "taginfo"
-    group "taginfo"
-    mode 0o644
-  end
-
-  file "#{directory}/planet/replication/download.lock" do
-    owner "taginfo"
-    group "taginfo"
-    mode 0o644
-  end
-
   template "#{directory}/bin/update-planet" do
     source "update-planet.erb"
     owner "taginfo"
@@ -237,13 +207,16 @@ node[:taginfo][:sites].each do |site|
     variables :name => site_name, :directory => directory
   end
 
+  passenger_application "#{directory}/taginfo/web/public"
+
   ssl_certificate site_name do
-    domains site_name
+    domains [site_name] + site_aliases
     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"
+    variables :aliases => site_aliases
   end
 end