fix syntax

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 93aa75c1c9ca34c65caecb76c21d42b31ee6c630..14500499ff8cea5c073251f99362c4c83c2ecaaa 100644 (file)
--- 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"
@@ -334,7 +338,7 @@ else
   end
 
   service "nominatim-update-maintenance-trigger" do
-    action [:enable, :start]
+    action [:enable]
   end
 end
 
@@ -455,6 +459,15 @@ munin_plugin "nominatim_requests" do
   target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 
+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"
@@ -476,6 +489,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]
@@ -507,9 +522,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