From 3efa43ef686b4381e21b9dc1f636abdec885cacd Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 26 Aug 2020 16:42:52 +0200 Subject: [PATCH] Switch taginfo C++ tools from internal to the new repository --- cookbooks/taginfo/recipes/default.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index 9fa2d7f99..cba2f6890 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -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" -- 2.39.5