nominatim: reorganise recipe for Debian installation

Switch from on-the-machine-compilation to installing a Python
package from a custom pip server. Also removes a lot of cruft
like database replication and use of tablespaces.

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 510dc4bcbe179dc41fd89ca13bcdab0e9a66fb6d..a7037ee206ded534faa66dd0e6bb3df721bf7856 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -5,6 +5,7 @@ default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
+default[:nominatim][:pip_index] = "https://nominatim.org/data/osm-production"
 default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"
 default[:nominatim][:revision] = "deploy"
 default[:nominatim][:enable_backup] = false
@@ -14,7 +15,7 @@ default[:nominatim][:ui_repository] = "https://git.openstreetmap.org/public/nomi
 default[:nominatim][:ui_revision] = "master"
 default[:nominatim][:qa_repository] = "https://github.com/osm-search/Nominatim-Data-Analyser"
 default[:nominatim][:qa_revision] = "deploy"
-default[:nominatim][:api_flavour] = "php"
+default[:nominatim][:api_flavour] = "python"
 default[:nominatim][:api_workers] = 10
 default[:nominatim][:api_pool_size] = 10
 default[:nominatim][:api_query_timeout] = 5

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index d8440761a08a5513ced2497b04ab41597a755046..656ce69e59cce39f8ae1a60729ca8c8b5c5de3de 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,630 +20,974 @@
 include_recipe "accounts"
 include_recipe "prometheus"
 
-if node[:nominatim][:api_flavour] == "php"
-  include_recipe "php::fpm"
-end
+if platform?("debian")
+  include_recipe "postgresql"
+  include_recipe "python"
+  include_recipe "nginx"
+  include_recipe "git"
+  include_recipe "fail2ban"
+
+  basedir = data_bag_item("accounts", "nominatim")["home"]
+  project_directory = "#{basedir}/planet-project"
+  bin_directory = "#{basedir}/bin"
+  cfg_directory = "#{basedir}/etc"
+  ui_directory = "#{basedir}/ui"
+  qa_bin_directory = "#{basedir}/Nominatim-Data-Analyser"
+  qa_data_directory = "#{basedir}/qa-data"
+
+  directory basedir do
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    recursive true
+  end
 
-basedir = data_bag_item("accounts", "nominatim")["home"]
-email_errors = data_bag_item("accounts", "lonvia")["email"]
+  [basedir, bin_directory, cfg_directory, project_directory, ui_directory].each do |path|
+    directory path do
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+    end
+  end
 
-directory basedir do
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  recursive true
-end
+  if node[:nominatim][:flatnode_file]
+    directory File.dirname(node[:nominatim][:flatnode_file]) do
+      recursive true
+    end
+  end
 
-## Log directory setup
+  directory "#{bin_directory}/maintenance" do
+    owner "nominatim"
+    group "nominatim"
+    mode "775"
+  end
 
-directory node[:nominatim][:logdir] do
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  recursive true
-end
+  ## Log directory setup
 
-file "#{node[:nominatim][:logdir]}/query.log" do
-  action :create_if_missing
-  owner "www-data"
-  group "adm"
-  mode "664"
-end
+  directory node[:nominatim][:logdir] do
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    recursive true
+  end
 
-file "#{node[:nominatim][:logdir]}/update.log" do
-  action :create_if_missing
-  owner "nominatim"
-  group "adm"
-  mode "664"
-end
+  file "#{node[:nominatim][:logdir]}/query.log" do
+    action :create_if_missing
+    owner "www-data"
+    group "adm"
+    mode "664"
+  end
 
-## Postgresql
+  ### Postgresql
 
-include_recipe "postgresql"
+  postgresql_version = node[:nominatim][:dbcluster].split("/").first
+  postgis_version = node[:nominatim][:postgis]
 
-postgresql_version = node[:nominatim][:dbcluster].split("/").first
-postgis_version = node[:nominatim][:postgis]
+  package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
-package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
+  node[:nominatim][:dbadmins].each do |user|
+    postgresql_user user do
+      cluster node[:nominatim][:dbcluster]
+      superuser true
+    end
+  end
 
-node[:nominatim][:dbadmins].each do |user|
-  postgresql_user user do
+  postgresql_user "nominatim" do
     cluster node[:nominatim][:dbcluster]
     superuser true
-    only_if { node[:nominatim][:state] != "slave" }
   end
-end
-
-postgresql_user "nominatim" do
-  cluster node[:nominatim][:dbcluster]
-  superuser true
-  only_if { node[:nominatim][:state] != "slave" }
-end
-
-postgresql_user "www-data" do
-  cluster node[:nominatim][:dbcluster]
-  only_if { node[:nominatim][:state] != "slave" }
-end
-
-directory "#{basedir}/tablespaces" do
-  owner "postgres"
-  group "postgres"
-  mode "700"
-end
 
-# NOTE: tablespaces must be exactly in the same location on each
-#       Nominatim instance when replication is in use. Therefore
-#       use symlinks to canonical directory locations.
-node[:nominatim][:tablespaces].each do |name, location|
-  directory location do
-    owner "postgres"
-    group "postgres"
-    mode "700"
-    recursive true
+  postgresql_user "www-data" do
+    cluster node[:nominatim][:dbcluster]
   end
 
-  link "#{basedir}/tablespaces/#{name}" do
-    to location
-  end
+  ### Nominatim
 
-  postgresql_tablespace name do
-    cluster node[:nominatim][:dbcluster]
-    location "#{basedir}/tablespaces/#{name}"
-  end
-end
+  python_directory = "#{basedir}/venv"
 
-## Nominatim backend
-
-include_recipe "git"
-include_recipe "python"
-
-python_directory = "#{basedir}/venv"
-
-package %w[
-  build-essential
-  cmake
-  g++
-  libboost-dev
-  libboost-system-dev
-  libboost-filesystem-dev
-  libexpat1-dev
-  zlib1g-dev
-  libbz2-dev
-  libpq-dev
-  libproj-dev
-  liblua5.3-dev
-  libluajit-5.1-dev
-  libicu-dev
-  nlohmann-json3-dev
-  lua5.3
-  python3-pyosmium
-  python3-psycopg2
-  python3-dotenv
-  python3-psutil
-  python3-jinja2
-  python3-icu
-  python3-datrie
-  python3-yaml
-  python3-sqlalchemy-ext
-  python3-geoalchemy2
-  python3-asyncpg
-  python3-dev
-  pkg-config
-  ruby
-  ruby-file-tail
-  ruby-pg
-  ruby-webrick
-]
-
-if node[:nominatim][:api_flavour] == "php"
   package %w[
-    php-pgsql
-    php-intl
+    libicu-dev
+    python3-dev
+    pkg-config
+    osm2pgsql
   ]
-elsif node[:nominatim][:api_flavour] == "python"
 
   python_virtualenv python_directory do
     interpreter "/usr/bin/python3"
   end
 
-  python_package "SQLAlchemy" do
+  # These are updated during the database update.
+  python_package "nominatim-db" do
     python_virtualenv python_directory
-    version "2.0.32"
+    extra_index_url node[:nominatim][:pip_index]
   end
 
-  python_package "PyICU" do
+  python_package "nominatim-api" do
     python_virtualenv python_directory
-    version "2.13.1"
+    extra_index_url node[:nominatim][:pip_index]
   end
 
-  python_package "psycopg[binary]" do
-    python_virtualenv python_directory
-    version "3.2.1"
+  remote_directory "#{project_directory}/static-website" do
+    source "website"
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    files_owner "nominatim"
+    files_group "nominatim"
+    files_mode "644"
+    purge false
   end
 
-  python_package "psycopg2-binary" do
-    python_virtualenv python_directory
-    version "2.9.9"
+  template "#{project_directory}/.env" do
+    source "nominatim.env.erb"
+    owner "nominatim"
+    group "nominatim"
+    mode "664"
+    variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
+              :dbname => node[:nominatim][:dbname],
+              :flatnode_file => node[:nominatim][:flatnode_file],
+              :log_file => "#{node[:nominatim][:logdir]}/query.log",
+              :pool_size => node[:nominatim][:api_pool_size],
+              :query_timeout => node[:nominatim][:api_query_timeout],
+              :request_timeout => node[:nominatim][:api_request_timeout]
   end
 
-  python_package "python-dotenv" do
-    python_virtualenv python_directory
-    version "1.0.1"
+  remote_file "#{project_directory}/secondary_importance.sql.gz" do
+    action :create_if_missing
+    source "https://nominatim.org/data/wikimedia-secondary-importance.sql.gz"
+    owner "nominatim"
+    group "nominatim"
+    mode "644"
   end
 
-  python_package "pygments" do
-    python_virtualenv python_directory
-    version "2.18.0"
+  remote_file "#{project_directory}/wikimedia-importance.csv.gz" do
+    action :create_if_missing
+    source "https://nominatim.org/data/wikimedia-importance.csv.gz"
+    owner "nominatim"
+    group "nominatim"
+    mode "644"
   end
 
-  python_package "PyYAML" do
-    python_virtualenv python_directory
-    version "6.0.2"
+  %w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
+    remote_file "#{project_directory}/#{fname}" do
+      action :create
+      source "https://nominatim.org/data/#{fname}"
+      owner "nominatim"
+      group "nominatim"
+      mode "644"
+    end
   end
 
-  python_package "falcon" do
-    python_virtualenv python_directory
-    version "3.1.3"
+  # Webserver + frontend
+
+  %w[user_agent referrer email generic].each do |name|
+    file "#{cfg_directory}/nginx_blocked_#{name}.conf" do
+      action :create_if_missing
+      owner "nominatim"
+      group "adm"
+      mode "664"
+    end
   end
 
-  python_package "uvicorn" do
-    python_virtualenv python_directory
-    version "0.30.5"
+  systemd_service "nominatim" do
+    description "Nominatim running as a gunicorn application"
+    user "www-data"
+    group "www-data"
+    working_directory project_directory
+    standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
+    standard_error "inherit"
+    exec_start "#{python_directory}/bin/gunicorn --max-requests 200000 -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker 'nominatim_api.server.falcon.server:run_wsgi()'"
+    exec_reload "/bin/kill -s HUP $MAINPID"
+    kill_mode "mixed"
+    timeout_stop_sec 5
+    private_tmp true
+    requires "nominatim.socket"
+    after "network.target"
   end
 
-  python_package "gunicorn" do
-    python_virtualenv python_directory
-    version "22.0.0"
+  systemd_socket "nominatim" do
+    description "Gunicorn socket for Nominatim"
+    listen_stream "/run/gunicorn-nominatim.openstreetmap.org.sock"
+    socket_user "www-data"
   end
 
-  python_package "jinja2" do
-    python_virtualenv python_directory
-    version "3.1.4"
+  ssl_certificate node[:fqdn] do
+    domains [node[:fqdn],
+             "nominatim.openstreetmap.org",
+             "nominatim.osm.org",
+             "nominatim.openstreetmap.com",
+             "nominatim.openstreetmap.net",
+             "nominatim.openstreetmaps.org",
+             "nominatim.openmaps.org",
+             "nominatim.qgis.org"]
+    notifies :reload, "service[nginx]"
   end
 
-  python_package "datrie" do
-    python_virtualenv python_directory
-    version "0.8.2"
+  nginx_site "default" do
+    action [:delete]
   end
 
-  python_package "psutil" do
-    python_virtualenv python_directory
-    version "6.0.0"
+  frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
+
+  nginx_site "nominatim" do
+    template "nginx.erb"
+    directory project_directory
+    variables :pools => node[:nominatim][:fpm_pools],
+              :frontends => frontends,
+              :confdir => "#{basedir}/etc",
+              :ui_directory => ui_directory
   end
 
-  python_package "osmium" do
-    python_virtualenv python_directory
-    version "3.7.0"
+  template "/etc/logrotate.d/nginx" do
+    source "logrotate.nginx.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
+
+  ### Import, update and maintenance scripts
+
+  %w[nominatim-update
+     nominatim-update-data
+     nominatim-update-refresh-db
+     nominatim-daily-maintenance].each do |fname|
+    template "#{bin_directory}/#{fname}" do
+      source "#{fname}.erb"
+      owner "nominatim"
+      group "nominatim"
+      mode "554"
+      variables :bindir => bin_directory,
+                :projectdir => project_directory,
+                :venvprefix => "#{python_directory}/bin/",
+                :qadatadir => qa_data_directory
+    end
+  end
+
+  systemd_service "nominatim-update" do
+    description "Update the Nominatim database"
+    exec_start "#{bin_directory}/nominatim-update"
+    restart "on-success"
+    standard_output "journal"
+    standard_error "inherit"
+    working_directory project_directory
+  end
+
+  systemd_service "nominatim-update-maintenance-trigger" do
+    description "Trigger daily maintenance tasks for Nominatim DB"
+    exec_start "ln -sf #{bin_directory}/nominatim-daily-maintenance #{bin_directory}/maintenance/"
+    user "nominatim"
+  end
+
+  systemd_timer "nominatim-update-maintenance-trigger" do
+    action node[:nominatim][:state] != "off" ? :create : :delete
+    description "Schedule daily maintenance tasks for Nominatim DB"
+    on_calendar "*-*-* 02:03:00 UTC"
+  end
+
+  service "nominatim-update-maintenance-trigger" do
+    action node[:nominatim][:state] != "off" ? :enable : :disable
   end
-end
 
-source_directory = "#{basedir}/src/nominatim"
-build_directory = "#{basedir}/src/build"
-project_directory = "#{basedir}/planet-project"
-bin_directory = "#{basedir}/bin"
-cfg_directory = "#{basedir}/etc"
-ui_directory = "#{basedir}/ui"
-qa_bin_directory = "#{basedir}/src/Nominatim-Data-Analyser"
-qa_data_directory = "#{basedir}/qa-data"
-
-[basedir, "#{basedir}/src", cfg_directory, bin_directory, build_directory, project_directory].each do |path|
-  directory path do
+  ## Nominatim UI
+
+  git ui_directory do
+    action :sync
+    repository node[:nominatim][:ui_repository]
+    revision node[:nominatim][:ui_revision]
+    user "nominatim"
+    group "nominatim"
+  end
+
+  template "#{ui_directory}/dist/theme/config.theme.js" do
+    source "ui-config.js.erb"
     owner "nominatim"
     group "nominatim"
-    mode "755"
-    recursive true
+    mode "664"
   end
-end
 
-directory "#{bin_directory}/maintenance" do
-  owner "nominatim"
-  group "nominatim"
-  mode "775"
-end
+  ## Nominatim QA
 
-if node[:nominatim][:flatnode_file]
-  directory File.dirname(node[:nominatim][:flatnode_file]) do
-    recursive true
+  if node[:nominatim][:enable_qa_tiles]
+    python_package "nominatim-data-analyser" do
+      python_virtualenv python_directory
+      extra_index_url node[:nominatim][:pip_index]
+    end
+
+    directory qa_data_directory do
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+      recursive true
+    end
+
+    template "#{project_directory}/qa-config.yaml" do
+      source "qa_config.erb"
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+      variables :outputdir => "#{qa_data_directory}/new"
+    end
+
+    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 qa_data_directory
+      variables :qa_data_directory => qa_data_directory
+    end
   end
-end
 
-remote_directory "#{project_directory}/static-website" do
-  source "website"
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  files_owner "nominatim"
-  files_group "nominatim"
-  files_mode "644"
-  purge false
-end
+  ## Logging and monitoring
 
-# Normally syncing via chef is a bad idea because syncing might involve
-# an update of database functions which should not be done while an update
-# is ongoing. Therefore we sync in between update cycles. There is an
-# exception for slaves: they get DB function updates from the master, so
-# only the source code needs to be updated, which chef may do.
-git source_directory do
-  action node[:nominatim][:state] == "slave" ? :sync : :checkout
-  repository node[:nominatim][:repository]
-  revision node[:nominatim][:revision]
-  enable_submodules true
-  user "nominatim"
-  group "nominatim"
-  not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
-  notifies :run, "execute[compile_nominatim]"
-end
+  template "/etc/logrotate.d/nominatim" do
+    source "logrotate.nominatim.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
 
-remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
-  action :create_if_missing
-  source "https://nominatim.org/data/country_grid.sql.gz"
-  owner "nominatim"
-  group "nominatim"
-  mode "644"
-end
+  prometheus_exporter "nominatim" do
+    port 8082
+    user "www-data"
+    restrict_address_families "AF_UNIX"
+    options [
+      "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log",
+      "--nominatim.database-name=#{node[:nominatim][:dbname]}"
+    ]
+  end
 
-execute "compile_nominatim" do
-  action :nothing
-  user "nominatim"
-  cwd build_directory
-  command "cmake #{source_directory} && make"
-  notifies :run, "execute[install_nominatim]"
-end
+################################# END OF DEBIAN #############################
 
-execute "install_nominatim" do
-  action :nothing
-  cwd build_directory
-  command "make install"
-end
+else
 
-# Project directory
-
-template "#{project_directory}/.env" do
-  source "nominatim.env.erb"
-  owner "nominatim"
-  group "nominatim"
-  mode "664"
-  variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
-            :dbname => node[:nominatim][:dbname],
-            :flatnode_file => node[:nominatim][:flatnode_file],
-            :log_file => "#{node[:nominatim][:logdir]}/query.log",
-            :tokenizer => node[:nominatim][:config][:tokenizer],
-            :forward_dependencies => node[:nominatim][:config][:forward_dependencies],
-            :pool_size => node[:nominatim][:api_pool_size],
-            :query_timeout => node[:nominatim][:api_query_timeout],
-            :request_timeout => node[:nominatim][:api_request_timeout]
-end
+  if node[:nominatim][:api_flavour] == "php"
+    include_recipe "php::fpm"
+  end
 
-remote_file "#{project_directory}/secondary_importance.sql.gz" do
-  action :create_if_missing
-  source "https://nominatim.org/data/wikimedia-secondary-importance.sql.gz"
-  owner "nominatim"
-  group "nominatim"
-  mode "644"
-end
+  basedir = data_bag_item("accounts", "nominatim")["home"]
+  email_errors = data_bag_item("accounts", "lonvia")["email"]
 
-remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
-  action :create_if_missing
-  source "https://nominatim.org/data/wikimedia-importance.sql.gz"
-  owner "nominatim"
-  group "nominatim"
-  mode "644"
-end
+  directory basedir do
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    recursive true
+  end
+
+  ## Log directory setup
 
-%w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
-  remote_file "#{project_directory}/#{fname}" do
-    action :create
-    source "https://nominatim.org/data/#{fname}"
+  directory node[:nominatim][:logdir] do
     owner "nominatim"
     group "nominatim"
-    mode "644"
+    mode "755"
+    recursive true
   end
-end
 
-# Webserver + frontend
+  file "#{node[:nominatim][:logdir]}/query.log" do
+    action :create_if_missing
+    owner "www-data"
+    group "adm"
+    mode "664"
+  end
 
-%w[user_agent referrer email generic].each do |name|
-  file "#{cfg_directory}/nginx_blocked_#{name}.conf" do
+  file "#{node[:nominatim][:logdir]}/update.log" do
     action :create_if_missing
     owner "nominatim"
     group "adm"
     mode "664"
   end
-end
 
-if node[:nominatim][:api_flavour] == "php"
-  node[:nominatim][:fpm_pools].each do |name, data|
-    php_fpm name do
-      port data[:port]
-      pm data[:pm]
-      pm_max_children data[:max_children]
-      pm_start_servers 20
-      pm_min_spare_servers 10
-      pm_max_spare_servers 20
-      pm_max_requests 10000
-      prometheus_port data[:prometheus_port]
+  ## Postgresql
+
+  include_recipe "postgresql"
+
+  postgresql_version = node[:nominatim][:dbcluster].split("/").first
+  postgis_version = node[:nominatim][:postgis]
+
+  package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
+
+  node[:nominatim][:dbadmins].each do |user|
+    postgresql_user user do
+      cluster node[:nominatim][:dbcluster]
+      superuser true
+      only_if { node[:nominatim][:state] != "slave" }
     end
   end
-elsif node[:nominatim][:api_flavour] == "python"
-  systemd_service "nominatim" do
-    description "Nominatim running as a gunicorn application"
-    user "www-data"
-    group "www-data"
-    working_directory project_directory
-    standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
-    standard_error "inherit"
-    exec_start "#{python_directory}/bin/gunicorn --max-requests 200000 -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker nominatim_api.server.falcon.server:run_wsgi"
-    exec_reload "/bin/kill -s HUP $MAINPID"
-    environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
-    kill_mode "mixed"
-    timeout_stop_sec 5
-    private_tmp true
-    requires "nominatim.socket"
-    after "network.target"
+
+  postgresql_user "nominatim" do
+    cluster node[:nominatim][:dbcluster]
+    superuser true
+    only_if { node[:nominatim][:state] != "slave" }
   end
 
-  systemd_socket "nominatim" do
-    description "Gunicorn socket for Nominatim"
-    listen_stream "/run/gunicorn-nominatim.openstreetmap.org.sock"
-    socket_user "www-data"
+  postgresql_user "www-data" do
+    cluster node[:nominatim][:dbcluster]
+    only_if { node[:nominatim][:state] != "slave" }
   end
-end
 
-ssl_certificate node[:fqdn] do
-  domains [node[:fqdn],
-           "nominatim.openstreetmap.org",
-           "nominatim.osm.org",
-           "nominatim.openstreetmap.com",
-           "nominatim.openstreetmap.net",
-           "nominatim.openstreetmaps.org",
-           "nominatim.openmaps.org",
-           "nominatim.qgis.org"]
-  notifies :reload, "service[nginx]"
-end
+  directory "#{basedir}/tablespaces" do
+    owner "postgres"
+    group "postgres"
+    mode "700"
+  end
 
-include_recipe "nginx"
+  # NOTE: tablespaces must be exactly in the same location on each
+  #       Nominatim instance when replication is in use. Therefore
+  #       use symlinks to canonical directory locations.
+  node[:nominatim][:tablespaces].each do |name, location|
+    directory location do
+      owner "postgres"
+      group "postgres"
+      mode "700"
+      recursive true
+    end
 
-nginx_site "default" do
-  action [:delete]
-end
+    link "#{basedir}/tablespaces/#{name}" do
+      to location
+    end
 
-frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
+    postgresql_tablespace name do
+      cluster node[:nominatim][:dbcluster]
+      location "#{basedir}/tablespaces/#{name}"
+    end
+  end
 
-nginx_site "nominatim" do
-  template "nginx.erb"
-  directory project_directory
-  variables :pools => node[:nominatim][:fpm_pools],
-            :frontends => frontends,
-            :confdir => "#{basedir}/etc",
-            :ui_directory => ui_directory
-end
+  ## Nominatim backend
 
-template "/etc/logrotate.d/nginx" do
-  source "logrotate.nginx.erb"
-  owner "root"
-  group "root"
-  mode "644"
-end
+  include_recipe "git"
+  include_recipe "python"
 
-# Updates
+  python_directory = "#{basedir}/venv"
 
-%w[nominatim-update
-   nominatim-update-source
-   nominatim-update-refresh-db
-   nominatim-update-data
-   nominatim-daily-maintenance].each do |fname|
-  template "#{bin_directory}/#{fname}" do
-    source "#{fname}.erb"
-    owner "nominatim"
-    group "nominatim"
-    mode "554"
-    variables :bindir => bin_directory,
-              :srcdir => source_directory,
-              :builddir => build_directory,
-              :projectdir => project_directory,
-              :qabindir => qa_bin_directory,
-              :qadatadir => qa_data_directory
-  end
-end
+  package %w[
+    build-essential
+    cmake
+    g++
+    libboost-dev
+    libboost-system-dev
+    libboost-filesystem-dev
+    libexpat1-dev
+    zlib1g-dev
+    libbz2-dev
+    libpq-dev
+    libproj-dev
+    liblua5.3-dev
+    libluajit-5.1-dev
+    libicu-dev
+    nlohmann-json3-dev
+    lua5.3
+    python3-pyosmium
+    python3-psycopg2
+    python3-dotenv
+    python3-psutil
+    python3-jinja2
+    python3-icu
+    python3-datrie
+    python3-yaml
+    python3-sqlalchemy-ext
+    python3-geoalchemy2
+    python3-asyncpg
+    python3-dev
+    pkg-config
+    ruby
+    ruby-file-tail
+    ruby-pg
+    ruby-webrick
+  ]
 
-systemd_service "nominatim-update" do
-  description "Update the Nominatim database"
-  exec_start "#{bin_directory}/nominatim-update"
-  restart "on-success"
-  standard_output "append:#{node[:nominatim][:logdir]}/update.log"
-  standard_error "inherit"
-  working_directory project_directory
-end
+  if node[:nominatim][:api_flavour] == "php"
+    package %w[
+      php-pgsql
+      php-intl
+    ]
+  elsif node[:nominatim][:api_flavour] == "python"
 
-systemd_service "nominatim-update-maintenance-trigger" do
-  description "Trigger daily maintenance tasks for Nominatim DB"
-  exec_start "ln -sf #{bin_directory}/nominatim-daily-maintenance #{bin_directory}/maintenance/"
-  user "nominatim"
-end
+    python_virtualenv python_directory do
+      interpreter "/usr/bin/python3"
+    end
 
-systemd_timer "nominatim-update-maintenance-trigger" do
-  action node[:nominatim][:state] != "off" ? :create : :delete
-  description "Schedule daily maintenance tasks for Nominatim DB"
-  on_calendar "*-*-* 02:03:00 UTC"
-end
+    python_package "SQLAlchemy" do
+      python_virtualenv python_directory
+      version "2.0.32"
+    end
 
-service "nominatim-update-maintenance-trigger" do
-  action node[:nominatim][:state] != "off" ? :enable : :disable
-end
+    python_package "PyICU" do
+      python_virtualenv python_directory
+      version "2.13.1"
+    end
 
-# Nominatim UI
+    python_package "psycopg[binary]" do
+      python_virtualenv python_directory
+      version "3.2.1"
+    end
 
-git ui_directory do
-  action :sync
-  repository node[:nominatim][:ui_repository]
-  revision node[:nominatim][:ui_revision]
-  user "nominatim"
-  group "nominatim"
-end
+    python_package "psycopg2-binary" do
+      python_virtualenv python_directory
+      version "2.9.9"
+    end
 
-template "#{ui_directory}/dist/theme/config.theme.js" do
-  source "ui-config.js.erb"
-  owner "nominatim"
-  group "nominatim"
-  mode "664"
-end
+    python_package "python-dotenv" do
+      python_virtualenv python_directory
+      version "1.0.1"
+    end
 
-# Nominatim QA
+    python_package "pygments" do
+      python_virtualenv python_directory
+      version "2.18.0"
+    end
 
-if node[:nominatim][:enable_qa_tiles]
-  package "python3-geojson"
+    python_package "PyYAML" do
+      python_virtualenv python_directory
+      version "6.0.2"
+    end
+
+    python_package "falcon" do
+      python_virtualenv python_directory
+      version "3.1.3"
+    end
+
+    python_package "uvicorn" do
+      python_virtualenv python_directory
+      version "0.30.5"
+    end
+
+    python_package "gunicorn" do
+      python_virtualenv python_directory
+      version "22.0.0"
+    end
+
+    python_package "jinja2" do
+      python_virtualenv python_directory
+      version "3.1.4"
+    end
+
+    python_package "datrie" do
+      python_virtualenv python_directory
+      version "0.8.2"
+    end
 
-  git qa_bin_directory do
-    repository node[:nominatim][:qa_repository]
-    revision node[:nominatim][:qa_revision]
+    python_package "psutil" do
+      python_virtualenv python_directory
+      version "6.0.0"
+    end
+
+    python_package "osmium" do
+      python_virtualenv python_directory
+      version "3.7.0"
+    end
+  end
+
+  source_directory = "#{basedir}/src/nominatim"
+  build_directory = "#{basedir}/src/build"
+  project_directory = "#{basedir}/planet-project"
+  bin_directory = "#{basedir}/bin"
+  cfg_directory = "#{basedir}/etc"
+  ui_directory = "#{basedir}/ui"
+  qa_bin_directory = "#{basedir}/src/Nominatim-Data-Analyser"
+  qa_data_directory = "#{basedir}/qa-data"
+
+  [basedir, "#{basedir}/src", cfg_directory, bin_directory, build_directory, project_directory].each do |path|
+    directory path do
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+      recursive true
+    end
+  end
+
+  directory "#{bin_directory}/maintenance" do
+    owner "nominatim"
+    group "nominatim"
+    mode "775"
+  end
+
+  if node[:nominatim][:flatnode_file]
+    directory File.dirname(node[:nominatim][:flatnode_file]) do
+      recursive true
+    end
+  end
+
+  remote_directory "#{project_directory}/static-website" do
+    source "website"
+    owner "nominatim"
+    group "nominatim"
+    mode "755"
+    files_owner "nominatim"
+    files_group "nominatim"
+    files_mode "644"
+    purge false
+  end
+
+  # Normally syncing via chef is a bad idea because syncing might involve
+  # an update of database functions which should not be done while an update
+  # is ongoing. Therefore we sync in between update cycles. There is an
+  # exception for slaves: they get DB function updates from the master, so
+  # only the source code needs to be updated, which chef may do.
+  git source_directory do
+    action node[:nominatim][:state] == "slave" ? :sync : :checkout
+    repository node[:nominatim][:repository]
+    revision node[:nominatim][:revision]
     enable_submodules true
     user "nominatim"
     group "nominatim"
-    notifies :run, "execute[compile_qa]"
+    not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
+    notifies :run, "execute[compile_nominatim]"
   end
 
-  execute "compile_qa" do
+  remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
+    action :create_if_missing
+    source "https://nominatim.org/data/country_grid.sql.gz"
+    owner "nominatim"
+    group "nominatim"
+    mode "644"
+  end
+
+  execute "compile_nominatim" do
     action :nothing
     user "nominatim"
-    cwd "#{qa_bin_directory}/clustering-vt"
-    command "make"
+    cwd build_directory
+    command "cmake #{source_directory} && make"
+    notifies :run, "execute[install_nominatim]"
+  end
+
+  execute "install_nominatim" do
+    action :nothing
+    cwd build_directory
+    command "make install"
   end
 
-  directory qa_data_directory do
+  # Project directory
+
+  template "#{project_directory}/.env" do
+    source "nominatim.env.erb"
     owner "nominatim"
     group "nominatim"
-    mode "755"
-    recursive true
+    mode "664"
+    variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
+              :dbname => node[:nominatim][:dbname],
+              :flatnode_file => node[:nominatim][:flatnode_file],
+              :log_file => "#{node[:nominatim][:logdir]}/query.log",
+              :tokenizer => node[:nominatim][:config][:tokenizer],
+              :forward_dependencies => node[:nominatim][:config][:forward_dependencies],
+              :pool_size => node[:nominatim][:api_pool_size],
+              :query_timeout => node[:nominatim][:api_query_timeout],
+              :request_timeout => node[:nominatim][:api_request_timeout]
+  end
+
+  remote_file "#{project_directory}/secondary_importance.sql.gz" do
+    action :create_if_missing
+    source "https://nominatim.org/data/wikimedia-secondary-importance.sql.gz"
+    owner "nominatim"
+    group "nominatim"
+    mode "644"
   end
 
-  template "#{qa_bin_directory}/analyser/config/config.yaml" do
-    source "qa_config.erb"
+  remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
+    action :create_if_missing
+    source "https://nominatim.org/data/wikimedia-importance.sql.gz"
     owner "nominatim"
     group "nominatim"
-    mode "755"
-    variables :outputdir => "#{qa_data_directory}/new"
+    mode "644"
+  end
+
+  %w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
+    remote_file "#{project_directory}/#{fname}" do
+      action :create
+      source "https://nominatim.org/data/#{fname}"
+      owner "nominatim"
+      group "nominatim"
+      mode "644"
+    end
+  end
+
+  # Webserver + frontend
+
+  %w[user_agent referrer email generic].each do |name|
+    file "#{cfg_directory}/nginx_blocked_#{name}.conf" do
+      action :create_if_missing
+      owner "nominatim"
+      group "adm"
+      mode "664"
+    end
   end
 
-  ssl_certificate "qa-tile.nominatim.openstreetmap.org" do
-    domains ["qa-tile.nominatim.openstreetmap.org"]
+  if node[:nominatim][:api_flavour] == "php"
+    node[:nominatim][:fpm_pools].each do |name, data|
+      php_fpm name do
+        port data[:port]
+        pm data[:pm]
+        pm_max_children data[:max_children]
+        pm_start_servers 20
+        pm_min_spare_servers 10
+        pm_max_spare_servers 20
+        pm_max_requests 10000
+        prometheus_port data[:prometheus_port]
+      end
+    end
+  elsif node[:nominatim][:api_flavour] == "python"
+    systemd_service "nominatim" do
+      description "Nominatim running as a gunicorn application"
+      user "www-data"
+      group "www-data"
+      working_directory project_directory
+      standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
+      standard_error "inherit"
+      exec_start "#{python_directory}/bin/gunicorn --max-requests 200000 -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker nominatim_api.server.falcon.server:run_wsgi"
+      exec_reload "/bin/kill -s HUP $MAINPID"
+      environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
+      kill_mode "mixed"
+      timeout_stop_sec 5
+      private_tmp true
+      requires "nominatim.socket"
+      after "network.target"
+    end
+
+    systemd_socket "nominatim" do
+      description "Gunicorn socket for Nominatim"
+      listen_stream "/run/gunicorn-nominatim.openstreetmap.org.sock"
+      socket_user "www-data"
+    end
+  end
+
+  ssl_certificate node[:fqdn] do
+    domains [node[:fqdn],
+             "nominatim.openstreetmap.org",
+             "nominatim.osm.org",
+             "nominatim.openstreetmap.com",
+             "nominatim.openstreetmap.net",
+             "nominatim.openstreetmaps.org",
+             "nominatim.openmaps.org",
+             "nominatim.qgis.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
+  include_recipe "nginx"
+
+  nginx_site "default" do
+    action [:delete]
   end
 
-end
+  frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
 
-# Replication
+  nginx_site "nominatim" do
+    template "nginx.erb"
+    directory project_directory
+    variables :pools => node[:nominatim][:fpm_pools],
+              :frontends => frontends,
+              :confdir => "#{basedir}/etc",
+              :ui_directory => ui_directory
+  end
 
-cron_d "nominatim-clean-db" do
-  action node[:nominatim][:state] == "master" ? :create : :delete
-  minute "5"
-  hour "*/4"
-  user "postgres"
-  command "#{bin_directory}/clean-db-nominatim"
-  mailto email_errors
-end
+  template "/etc/logrotate.d/nginx" do
+    source "logrotate.nginx.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
 
-if node[:nominatim][:state] == "master"
-  postgresql_user "replication" do
-    cluster node[:nominatim][:dbcluster]
-    password data_bag_item("nominatim", "passwords")["replication"]
-    replication true
+  # Updates
+
+  %w[nominatim-update
+     nominatim-update-source
+     nominatim-update-refresh-db
+     nominatim-update-data
+     nominatim-daily-maintenance].each do |fname|
+    template "#{bin_directory}/#{fname}" do
+      source "#{fname}.erb"
+      owner "nominatim"
+      group "nominatim"
+      mode "554"
+      variables :bindir => bin_directory,
+                :srcdir => source_directory,
+                :builddir => build_directory,
+                :projectdir => project_directory,
+                :qabindir => qa_bin_directory,
+                :qadatadir => qa_data_directory
+    end
   end
 
-  directory node[:rsyncd][:modules][:archive][:path] do
-    owner "postgres"
-    group "postgres"
-    mode "700"
+  systemd_service "nominatim-update" do
+    description "Update the Nominatim database"
+    exec_start "#{bin_directory}/nominatim-update"
+    restart "on-success"
+    standard_output "append:#{node[:nominatim][:logdir]}/update.log"
+    standard_error "inherit"
+    working_directory project_directory
   end
 
-  template "#{bin_directory}/clean-db-nominatim" do
-    source "clean-db-nominatim.erb"
-    owner "nominatim"
-    group "nominatim"
-    mode "755"
-    variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
-              :update_stop_file => "#{basedir}/status/updates_disabled",
-              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fqdn] }.join(" ")
+  systemd_service "nominatim-update-maintenance-trigger" do
+    description "Trigger daily maintenance tasks for Nominatim DB"
+    exec_start "ln -sf #{bin_directory}/nominatim-daily-maintenance #{bin_directory}/maintenance/"
+    user "nominatim"
+  end
+
+  systemd_timer "nominatim-update-maintenance-trigger" do
+    action node[:nominatim][:state] != "off" ? :create : :delete
+    description "Schedule daily maintenance tasks for Nominatim DB"
+    on_calendar "*-*-* 02:03:00 UTC"
   end
-end
 
-# Maintenance
+  service "nominatim-update-maintenance-trigger" do
+    action node[:nominatim][:state] != "off" ? :enable : :disable
+  end
 
-cron_d "nominatim-backup" do
-  action (node[:nominatim][:enable_backup] && node[:nominatim][:state] != "off") ? :create : :delete
-  minute "0"
-  hour "3"
-  day "1"
-  user "nominatim"
-  command "#{bin_directory}/backup-nominatim"
-  mailto email_errors
-end
+  # Nominatim UI
 
-cron_d "nominatim-vacuum-db" do
-  action node[:nominatim][:state] != "off" ? :create : :delete
-  minute "20"
-  hour "0"
-  user "postgres"
-  command "#{bin_directory}/vacuum-db-nominatim"
-  mailto email_errors
-end
+  git ui_directory do
+    action :sync
+    repository node[:nominatim][:ui_repository]
+    revision node[:nominatim][:ui_revision]
+    user "nominatim"
+    group "nominatim"
+  end
 
-%w[backup-nominatim vacuum-db-nominatim].each do |fname|
-  template "#{bin_directory}/#{fname}" do
-    source "#{fname}.erb"
+  template "#{ui_directory}/dist/theme/config.theme.js" do
+    source "ui-config.js.erb"
     owner "nominatim"
     group "nominatim"
-    mode "755"
-    variables :db => node[:nominatim][:dbname]
+    mode "664"
   end
-end
 
-# Logging
+  # Nominatim QA
 
-template "/etc/logrotate.d/nominatim" do
-  source "logrotate.nominatim.erb"
-  owner "root"
-  group "root"
-  mode "644"
-end
+  if node[:nominatim][:enable_qa_tiles]
+    package "python3-geojson"
 
-# Monitoring
-prometheus_exporter "nominatim" do
-  port 8082
-  user "www-data"
-  restrict_address_families "AF_UNIX"
-  options [
-    "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log",
-    "--nominatim.database-name=#{node[:nominatim][:dbname]}"
-  ]
-end
+    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
+
+    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
+
+  # Replication
+
+  cron_d "nominatim-clean-db" do
+    action node[:nominatim][:state] == "master" ? :create : :delete
+    minute "5"
+    hour "*/4"
+    user "postgres"
+    command "#{bin_directory}/clean-db-nominatim"
+    mailto email_errors
+  end
+
+  if node[:nominatim][:state] == "master"
+    postgresql_user "replication" do
+      cluster node[:nominatim][:dbcluster]
+      password data_bag_item("nominatim", "passwords")["replication"]
+      replication true
+    end
+
+    directory node[:rsyncd][:modules][:archive][:path] do
+      owner "postgres"
+      group "postgres"
+      mode "700"
+    end
+
+    template "#{bin_directory}/clean-db-nominatim" do
+      source "clean-db-nominatim.erb"
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+      variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
+                :update_stop_file => "#{basedir}/status/updates_disabled",
+                :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fqdn] }.join(" ")
+    end
+  end
+
+  # Maintenance
+
+  cron_d "nominatim-backup" do
+    action (node[:nominatim][:enable_backup] && node[:nominatim][:state] != "off") ? :create : :delete
+    minute "0"
+    hour "3"
+    day "1"
+    user "nominatim"
+    command "#{bin_directory}/backup-nominatim"
+    mailto email_errors
+  end
+
+  cron_d "nominatim-vacuum-db" do
+    action node[:nominatim][:state] != "off" ? :create : :delete
+    minute "20"
+    hour "0"
+    user "postgres"
+    command "#{bin_directory}/vacuum-db-nominatim"
+    mailto email_errors
+  end
+
+  %w[backup-nominatim vacuum-db-nominatim].each do |fname|
+    template "#{bin_directory}/#{fname}" do
+      source "#{fname}.erb"
+      owner "nominatim"
+      group "nominatim"
+      mode "755"
+      variables :db => node[:nominatim][:dbname]
+    end
+  end
+
+  # Logging
+
+  template "/etc/logrotate.d/nominatim" do
+    source "logrotate.nominatim.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
+
+  # Monitoring
+  prometheus_exporter "nominatim" do
+    port 8082
+    user "www-data"
+    restrict_address_families "AF_UNIX"
+    options [
+      "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log",
+      "--nominatim.database-name=#{node[:nominatim][:dbname]}"
+    ]
+  end
 
-include_recipe "fail2ban"
+  include_recipe "fail2ban"
+end # platform?('debian')
 
 frontend_addresses = frontends.collect { |f| f.ipaddresses(:role => :external) }
 

diff --git a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
index 497cb41cf402b26b211aa22626a2f04ed6368e7e..1ff28a6311e4085981e26231d9b6414a95594860 100644 (file)
--- a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
@@ -1,15 +1,5 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<%= node[:nominatim][:logdir] %>/update.log {
-  weekly
-  missingok
-  rotate 30
-  compress
-  delaycompress
-  notifempty
-  create 640 nominatim adm
-}
-
 <%= node[:nominatim][:logdir] %>/query.log {
   weekly
   missingok
@@ -17,10 +7,8 @@
   compress
   delaycompress
   notifempty
-<% if node[:nominatim][:api_flavour] == "python" %>
   postrotate
         systemctl reload nominatim.service
   endscript
-<% end -%>
   create 640 www-data adm
 }

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index 3685b9de778f4c455bc806a6558914c5bca1394c..e60f0e3085904ed183ddfe6f6bc5bd6860a276ca 100644 (file)
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -1,9 +1,5 @@
 upstream nominatim_service {
-<% if node[:nominatim][:api_flavour] == "php" %>
-  server unix:/run/php/php-nominatim.openstreetmap.org-fpm.sock fail_timeout=0;
-<% elsif node[:nominatim][:api_flavour] == "python"  %>
   server unix:/run/gunicorn-nominatim.openstreetmap.org.sock fail_timeout=0;
-<% end -%>
 }
 
 map $uri $nominatim_script_name {
@@ -213,13 +209,6 @@ server {
         limit_req zone=tarpit burst=5;
         limit_req zone=reverse burst=5;
         limit_req_status 429;
-<% if node[:nominatim][:api_flavour] == "php" %>
-        fastcgi_pass nominatim_service;
-        include fastcgi_params;
-        fastcgi_param QUERY_STRING    $args;
-        fastcgi_param PATH_INFO       "$nominatim_path_info";
-        fastcgi_param SCRIPT_FILENAME  "<%= @directory %>/website/$nominatim_script_name";
-<% elsif node[:nominatim][:api_flavour] == "python" %>
 
         if ($request_method = 'OPTIONS') {
           add_header 'Content-Type' 'text/plain; charset=UTF-8';
@@ -235,30 +224,5 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_redirect off;
         proxy_pass http://nominatim_service;
-<% end -%>
     }
-
-<% if node[:nominatim][:api_flavour] == "php" %>
-    location ~* \.php$ {
-        if ($blocked_user_agent ~ ^2$)
-        { return 403; }
-        if ($blocked_referrer)
-        { return 403; }
-        if ($blocked_email)
-        { return 403; }
-        include <%= @confdir %>/nginx_blocked_generic.conf;
-
-        limit_req zone=www burst=10;
-        limit_req zone=tarpit burst=2;
-        limit_req zone=reverse burst=5;
-        limit_req_status 429;
-        fastcgi_pass    nominatim_service;
-        include         fastcgi_params;
-        fastcgi_param   SCRIPT_FILENAME    <%= @directory %>/website/$fastcgi_script_name;
-
-        if ($forward_to_ui) {
-            rewrite (.*).php https://$host/ui$1.html redirect;
-        }
-    }
-<% end -%>
 }

diff --git a/cookbooks/nominatim/templates/default/nominatim-daily-maintenance.erb b/cookbooks/nominatim/templates/default/nominatim-daily-maintenance.erb
index a7ede5bcba5b00475d8559a02e21cf63c6803493..03a51318af104e55c6e2f8847c67885925a75e24 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-daily-maintenance.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-daily-maintenance.erb
@@ -1,11 +1,19 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-nominatim refresh --postcodes --word-tokens --threads 4 -v
-nominatim admin --clean-deleted '1 month'
+cd <%= @projectdir %>
+
+<%= @venvprefix %>nominatim refresh --postcodes --word-tokens --threads 4 -v
+<%= @venvprefix %>nominatim admin --clean-deleted '1 month'
+
+psql -q -d <%= node[:nominatim][:dbname] %> -c 'VACUUM ANALYSE search_name'
 
 <% if node[:nominatim][:enable_qa_tiles] -%>
 pushd <%= @qabindir %>
+<% if node.platform?("debian") -%>
+if <%= @venvprefix %>nominatim-data-analyser --execute-all --config=<%= @projectdir %>/qa-config.yaml; then
+<% else -%>
 if python3 cli.py --execute-all; then
+<% end -%>
   rm -rf "<%= @qadatadir %>/old"
   if [ -d "<%= @qadatadir %>/current" ]; then
     mv "<%= @qadatadir %>/current" "<%= @qadatadir %>/old"

diff --git a/cookbooks/nominatim/templates/default/nominatim-update-data.erb b/cookbooks/nominatim/templates/default/nominatim-update-data.erb
index 69c832e5309320c3d4c432bc314fda59a127a516..00870711f5cc6fc7a040f9310903986c89c8d706 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update-data.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update-data.erb
@@ -27,4 +27,4 @@ else
     INST=2
 fi
 
-nominatim replication --catch-up --threads $INST
+<%= @venvprefix %>nominatim replication --catch-up --threads $INST

diff --git a/cookbooks/nominatim/templates/default/nominatim-update-refresh-db.erb b/cookbooks/nominatim/templates/default/nominatim-update-refresh-db.erb
index 6d7b415962d53fbd87dc4646884118141208995d..ff70bea457a4814a657a5b7d3111f48d5f14750f 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update-refresh-db.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update-refresh-db.erb
@@ -6,7 +6,12 @@ date "+%c === Refresh database after software updates"
 
 cd <%= @projectdir %>
 
+<% if node.platform?("debian") -%>
+<%= @venvprefix %>nominatim admin --migrate
+<%= @venvprefix %>nominatim refresh --functions --address-levels
+<% else -%>
 # Run the migrations from the nominatim version in the build directory,
 # so they can execute while the frontend doesn't have the new code yet.
 <%= @builddir %>/nominatim admin --migrate
 <%= @builddir %>/nominatim refresh --functions --address-levels --website
+<% end -%>

diff --git a/cookbooks/nominatim/templates/default/nominatim-update.erb b/cookbooks/nominatim/templates/default/nominatim-update.erb
index 145ae6a8c6f5e15f48c7d2e725d7406152108d99..ed5decedf29659ab74143055b43e7c5d90474b32 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update.erb
@@ -6,21 +6,35 @@ date "+%c === Starting Nominatim update cycle"
 
 starttime=`date +%s`
 
-<% if node[:nominatim][:enable_git_updates] -%>
-if /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-source; then
-
-  if ! /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-refresh-db; then
-    date "+%c === Database refresh failed. Stopping updates."
-    exit 1
+<% if node.platform?("debian") -%>
+  # First update the importer and run the migrations.
+  if <%= @venvprefix %>pip list --outdated | fgrep -q nominatim-db; then
+    <%= @venvprefix %>pip install -U nominatim-db
+    if ! /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-refresh-db; then
+      date "+%c === Database refresh failed. Stopping updates."
+      exit 1
+    fi
+  fi
+  # Then only attempt to update the frontend.
+  if <%= @venvprefix %>pip list --outdated | fgrep -q nominatim-api; then
+    <%= @venvprefix %>pip install -U nominatim-api
+    systemctl reload nominatim
   fi
+<% else -%>
+  <% if node[:nominatim][:enable_git_updates] -%>
+  if /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-source; then
 
-  pushd <%= @builddir %>
-  make install
+    if ! /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-refresh-db; then
+      date "+%c === Database refresh failed. Stopping updates."
+      exit 1
+    fi
 
-<% if node[:nominatim][:api_flavour] == "python" -%>
-  systemctl reload nominatim
-<% end -%>
-fi
+    pushd <%= @builddir %>
+    make install
+
+    systemctl reload nominatim
+  fi
+  <% end -%>
 <% end -%>
 
 if ! /sbin/runuser -u nominatim -- <%= @bindir %>/nominatim-update-data; then

diff --git a/cookbooks/nominatim/templates/default/nominatim.env.erb b/cookbooks/nominatim/templates/default/nominatim.env.erb
index 9f38b02ffbf32a0d3a5e73c294382a45a330d16e..37cb6da495122d6f02a89e12c7419370a2227145 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.env.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.env.erb
@@ -16,6 +16,7 @@ NOMINATIM_IMPORT_STYLE=extratags
 
 NOMINATIM_USE_US_TIGER_DATA=yes
 
+<% if node.platform?("ubuntu") -%>
 NOMINATIM_TOKENIZER="<%= @tokenizer %>"
 NOMINATIM_UPDATE_FORWARD_DEPENDENCIES="<%= @forward_dependencies %>"
 
@@ -29,6 +30,8 @@ NOMINATIM_TABLESPACE_ADDRESS_DATA=daddress
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=iaddress
 NOMINATIM_TABLESPACE_AUX_DATA=daux
 NOMINATIM_TABLESPACE_AUX_INDEX=iaux
+<% end -%>
+
 
 NOMINATIM_LOG_DB=no
 NOMINATIM_LOG_FILE="<%= @log_file %>"