X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0c902163b44774cd7f983fe99b1a1edb3600f6e7..5fef39842bb8b48f83422b60e8baacc63106ee24:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 9fa2d7f99..c63b8707c 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -119,7 +119,7 @@ node[:taginfo][:sites].each do |site|
     user "taginfo"
     group "taginfo"
     cwd "#{directory}/build"
-    command "cmake #{directory}/taginfo-tools && make"
+    command "cmake #{directory}/taginfo-tools -DCMAKE_BUILD_TYPE=Release && make"
     subscribes :run, "apt_package[libprotozero-dev]"
     subscribes :run, "apt_package[libosmium2-dev]"
     subscribes :run, "git[#{directory}/taginfo-tools]"
@@ -149,7 +149,7 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["download"] = ""
     settings["sources"]["create"] = "db languages projects wiki"
     settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.pbf"
-    settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
+    settings["sources"]["db"]["bindir"] = "#{directory}/build/src"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     JSON.pretty_generate(settings)
@@ -163,18 +163,6 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "service[apache2]"
   end
 
-  execute "#{directory}/taginfo/tagstats/Makefile" do
-    action :nothing
-    command "make"
-    cwd "#{directory}/taginfo/tagstats"
-    user "taginfo"
-    group "taginfo"
-    subscribes :run, "apt_package[libprotozero-dev]"
-    subscribes :run, "apt_package[libosmium2-dev]"
-    subscribes :run, "git[#{directory}/taginfo]"
-    notifies :restart, "service[apache2]"
-  end
-
   execute "#{directory}/taginfo/Gemfile" do
     action :nothing
     command "bundle#{ruby_version} install"