X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21b39d16f16c4497e1d40cf3f16774dac1eb08d5..f3d8422f1c3d8c1e8cf3cc04d9982b8cfb8878c4:/cookbooks/nominatim/recipes/default.rb?ds=inline

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 8f097925f..09ff3ff95 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,6 +20,7 @@
 include_recipe "accounts"
 include_recipe "munin"
 include_recipe "php::fpm"
+include_recipe "prometheus"
 
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
@@ -165,6 +166,9 @@ package %w[
   php-pgsql
   php-intl
   php-symfony-dotenv
+  ruby
+  ruby-file-tail
+  ruby-pg
 ]
 
 source_directory = "#{basedir}/nominatim"
@@ -211,6 +215,10 @@ execute "compile_nominatim" do
   command "cmake #{source_directory} && make"
 end
 
+link "/usr/local/bin/nominatim" do
+  to "#{build_directory}/nominatim"
+end
+
 template "#{source_directory}/.git/hooks/post-merge" do
   source "git-post-merge-hook.erb"
   owner "nominatim"
@@ -332,6 +340,10 @@ else
     description "Schedule maintenance tasks for Nominatim DB"
     on_calendar "*-*-* 02:03:00 UTC"
   end
+
+  service "nominatim-update-maintenance-trigger" do
+    action [:enable]
+  end
 end
 
 template "#{source_directory}/utils/nominatim-update" do
@@ -451,6 +463,17 @@ munin_plugin "nominatim_requests" do
   target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 
+package "ruby-webrick"
+
+prometheus_exporter "nominatim" do
+  port 8082
+  user "www-data"
+  options [
+    "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log",
+    "--nominatim.database-name=#{node[:nominatim][:dbname]}"
+  ]
+end
+
 directory "#{basedir}/status" do
   owner "nominatim"
   group "postgres"
@@ -472,6 +495,8 @@ end
 ### QA tile generation
 
 if node[:nominatim][:enable_qa_tiles]
+  package "python3-geojson"
+
   git qa_bin_directory do
     repository node[:nominatim][:qa_repository]
     revision node[:nominatim][:qa_revision]
@@ -503,9 +528,15 @@ if node[:nominatim][:enable_qa_tiles]
     variables :outputdir => "#{qa_data_directory}/new"
   end
 
-  link "#{build_directory}/website/qa-data" do
-    to "#{qa_data_directory}/current"
-    owner "nominatim"
-    group "nominatim"
+  ssl_certificate "qa-tile.nominatim.openstreetmap.org" do
+    domains ["qa-tile.nominatim.openstreetmap.org"]
+    notifies :reload, "service[nginx]"
   end
+
+  nginx_site "qa-tiles.nominatim" do
+    template "nginx-qa-tiles.erb"
+    directory build_directory
+    variables :qa_data_directory => qa_data_directory
+  end
+
 end