nominatim: add nightly updates for QA tiles

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index bb08987c70709e0a2b630e0412328e9c061363b5..b7d7a803ed2ffbb93d3eed6a897830772ef3a812 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -169,6 +169,9 @@ package %w[
   pyosmium
   python3-psycopg2
   python3-dotenv
   pyosmium
   python3-psycopg2
   python3-dotenv

+  python3-psutil
+  python3-jinja2
+  python3-icu

   php-pgsql
   php-intl
   php-symfony-dotenv
   php-pgsql
   php-intl
   php-symfony-dotenv


@@ -177,6 +180,8 @@ package %w[
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 ui_directory = "#{basedir}/ui"
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 ui_directory = "#{basedir}/ui"

+qa_bin_directory = "#{basedir}/Nominatim-Data-Analyser"
+qa_data_directory = "#{basedir}/qa-data"

 
 directory build_directory do
   owner "nominatim"
 
 directory build_directory do
   owner "nominatim"


@@ -267,8 +272,8 @@ end
 
 external_data = [
   "wikimedia-importance.sql.gz",
 
 external_data = [
   "wikimedia-importance.sql.gz",

-  "gb_postcode_data.sql.gz",
-  "us_postcode_data.sql.gz"
+  "gb_postcodes.csv.gz",
+  "us_postcodes.csv.gz"

 ]
 
 external_data.each do |fname|
 ]
 
 external_data.each do |fname|


@@ -344,7 +349,9 @@ template "#{source_directory}/utils/nominatim-update" do
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled",
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled",

-            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance",
+            :qabindir => qa_bin_directory,
+            :qadatadir => qa_data_directory

 end
 
 template "/etc/init.d/nominatim-update" do
 end
 
 template "/etc/init.d/nominatim-update" do


@@ -470,3 +477,44 @@ fail2ban_jail "nominatim_limit_req" do
   maxretry 20
   ignoreips frontend_addresses.flatten.sort
 end
   maxretry 20
   ignoreips frontend_addresses.flatten.sort
 end

+
+### QA tile generation
+
+if node[:nominatim][:enable_qa_tiles]
+  git qa_bin_directory do
+    repository node[:nominatim][:qa_repository]
+    revision node[:nominatim][:qa_revision]
+    enable_submodules true
+    user "nominatim"
+    group "nominatim"
+    notifies :run, "execute[compile_qa]"
+  end
+
+  execute "compile_qa" do
+    action :nothing
+    user "nominatim"
+    cwd "#{qa_bin_directory}/clustering-vt"
+    command "make"
+  end
+
+  directory qa_data_directory do
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    recursive true
+  end
+
+  template "#{qa_bin_directory}/analyser/config/config.yaml" do
+    source "qa_config.erb"
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    variables :outputdir => "#{qa_data_directory}/new"
+  end
+
+  link "#{build_directory}/website/qa-data" do
+    to "#{qa_data_directory}/current"
+    owner "nominatim"
+    group "nominatim"
+  end
+end