Revert "Use packages libosmium and protozero on taginfo server."
authorJochen Topf <jochen@topf.org>
Thu, 9 Aug 2018 21:09:36 +0000 (23:09 +0200)
committerJochen Topf <jochen@topf.org>
Thu, 9 Aug 2018 21:09:52 +0000 (23:09 +0200)
This reverts commit 4d7d82b464dbf2713991e62815502c825b9444d7.

Chef did not re-build taginfo after the package install,
so I am reversing this for now.

cookbooks/taginfo/recipes/default.rb

index e88b24451846dd18b720fadedc05e7f0e1845d85..288f39a96d98f777e299ab1389f72bf1ad07d78e 100644 (file)
@@ -33,8 +33,6 @@ package %w[
   libgd-dev
   libicu-dev
   libboost-program-options-dev
-  libosmium2-dev
-  libprotozero-dev
   cmake
   make
   g++
@@ -42,7 +40,6 @@ package %w[
 
 package %w[
   sqlite3
-  osmium-tool
   pyosmium
   curl
   pbzip2
@@ -107,6 +104,22 @@ 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"
@@ -131,6 +144,7 @@ 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)
@@ -150,12 +164,27 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "package[libprotozero-dev]"
-    subscribes :run, "package[libosmium2-dev]"
+    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"
+  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
+
   execute "#{directory}/taginfo/Gemfile" do
     action :nothing
     command "bundle#{ruby_version} install"