]> git.openstreetmap.org Git - chef.git/commitdiff
nominatim: move definitely to new v4 scripts
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 21 Jul 2022 19:14:05 +0000 (21:14 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 21 Jul 2022 19:14:05 +0000 (21:14 +0200)
cookbooks/nominatim/recipes/default.rb
cookbooks/nominatim/recipes/version4.rb [deleted file]
cookbooks/nominatim/templates/default/git-post-merge-hook.erb [deleted file]
cookbooks/nominatim/templates/default/ipblocks.erb [deleted file]
cookbooks/nominatim/templates/default/updater.erb [deleted file]
cookbooks/nominatim/templates/default/updater.init.erb [deleted file]
roles/dulcy.rb
roles/longma.rb
roles/nominatim-v4.rb [deleted file]
roles/pummelzacken.rb
roles/stormfly-04.rb

index 09ff3ff959f5c0618ad07a66ac53e34be15b7178..7b218d9511324d6b876286bdb7a4ba79925f2072 100644 (file)
@@ -32,6 +32,8 @@ directory basedir do
   recursive true
 end
 
+## Log directory setup
+
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
@@ -113,30 +115,6 @@ node[:nominatim][:tablespaces].each do |name, location|
   end
 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 "/usr/local/bin/clean-db-nominatim" do
-    source "clean-db-nominatim.erb"
-    owner "root"
-    group "root"
-    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
-
 ## Nominatim backend
 
 include_recipe "git"
@@ -150,38 +128,53 @@ package %w[
   libboost-filesystem-dev
   libexpat1-dev
   zlib1g-dev
-  libxml2-dev
   libbz2-dev
   libpq-dev
-  libgeos++-dev
   libproj-dev
   python3-pyosmium
-  pyosmium
   python3-psycopg2
   python3-dotenv
   python3-psutil
   python3-jinja2
   python3-icu
   python3-datrie
+  python3-yaml
   php-pgsql
   php-intl
-  php-symfony-dotenv
   ruby
   ruby-file-tail
   ruby-pg
+  ruby-webrick
 ]
 
-source_directory = "#{basedir}/nominatim"
-build_directory = "#{basedir}/bin"
+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}/Nominatim-Data-Analyser"
+qa_bin_directory = "#{basedir}/src/Nominatim-Data-Analyser"
 qa_data_directory = "#{basedir}/qa-data"
 
-directory build_directory do
+[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 "755"
-  recursive true
+  mode "775"
+end
+
+if node[:nominatim][:flatnode_file]
+  directory File.dirname(node[:nominatim][:flatnode_file]) do
+    recursive true
+  end
 end
 
 # Normally syncing via chef is a bad idea because syncing might involve
@@ -213,23 +206,18 @@ execute "compile_nominatim" do
   user "nominatim"
   cwd build_directory
   command "cmake #{source_directory} && make"
+  notifies :run, "execute[install_nominatim]"
 end
 
-link "/usr/local/bin/nominatim" do
-  to "#{build_directory}/nominatim"
+execute "install_nominatim" do
+  action :nothing
+  cwd build_directory
+  command "make install"
 end
 
-template "#{source_directory}/.git/hooks/post-merge" do
-  source "git-post-merge-hook.erb"
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  variables :srcdir => source_directory,
-            :builddir => build_directory,
-            :dbname => node[:nominatim][:dbname]
-end
+# Project directory
 
-template "#{build_directory}/.env" do
+template "#{project_directory}/.env" do
   source "nominatim.env.erb"
   owner "nominatim"
   group "nominatim"
@@ -241,42 +229,8 @@ template "#{build_directory}/.env" do
             :tokenizer => node[:nominatim][:config][:tokenizer]
 end
 
-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 "664"
-end
-
-if node[:nominatim][:flatnode_file]
-  directory File.dirname(node[:nominatim][:flatnode_file]) do
-    recursive true
-  end
-end
-
-template "/etc/logrotate.d/nominatim" do
-  source "logrotate.nominatim.erb"
-  owner "root"
-  group "root"
-  mode "644"
-end
-
-external_data = [
-  "wikimedia-importance.sql.gz",
-  "gb_postcodes.csv.gz",
-  "us_postcodes.csv.gz"
-]
-
-external_data.each do |fname|
-  remote_file "#{build_directory}/#{fname}" do
+%w[wikimedia-importance.sql.gz gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
+  remote_file "#{project_directory}/#{fname}" do
     action :create
     source "https://www.nominatim.org/data/#{fname}"
     owner "nominatim"
@@ -285,110 +239,10 @@ external_data.each do |fname|
   end
 end
 
-if node[:nominatim][:state] == "off"
-  cron_d "nominatim-backup" do
-    action :delete
-  end
-
-  cron_d "nominatim-vacuum-db" do
-    action :delete
-  end
-
-  cron_d "nominatim-clean-db" do
-    action :delete
-  end
-
-  systemd_timer "nominatim-update-maintenance-trigger" do
-    action :delete
-  end
-else
-  cron_d "nominatim-backup" do
-    action node[:nominatim][:enable_backup] ? :create : :delete
-    minute "0"
-    hour "3"
-    day "1"
-    user "nominatim"
-    command "/usr/local/bin/backup-nominatim"
-    mailto email_errors
-  end
-
-  cron_d "nominatim-vacuum-db" do
-    minute "20"
-    hour "0"
-    user "postgres"
-    command "/usr/local/bin/vacuum-db-nominatim"
-    mailto email_errors
-  end
-
-  cron_d "nominatim-clean-db" do
-    action node[:nominatim][:state] == "master" ? :create : :delete
-    minute "5"
-    hour "*/4"
-    user "postgres"
-    command "/usr/local/bin/clean-db-nominatim"
-    mailto email_errors
-  end
-
-  systemd_service "nominatim-update-maintenance-trigger" do
-    description "Trigger maintenance tasks for Nominatim DB"
-    exec_start "touch #{basedir}/status/update_maintenance"
-    user "nominatim"
-  end
-
-  systemd_timer "nominatim-update-maintenance-trigger" do
-    action :create
-    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
-  source "updater.erb"
-  user "nominatim"
-  group "nominatim"
-  mode "755"
-  variables :bindir => build_directory,
-            :srcdir => source_directory,
-            :logfile => "#{node[:nominatim][:logdir]}/update.log",
-            :branch => node[:nominatim][:revision],
-            :update_stop_file => "#{basedir}/status/updates_disabled",
-            :update_maintenance_trigger => "#{basedir}/status/update_maintenance",
-            :qabindir => qa_bin_directory,
-            :qadatadir => qa_data_directory
-end
-
-template "/etc/init.d/nominatim-update" do
-  source "updater.init.erb"
-  user "nominatim"
-  group "nominatim"
-  mode "755"
-  variables :source_directory => source_directory
-end
-
-%w[backup-nominatim vacuum-db-nominatim].each do |fname|
-  template "/usr/local/bin/#{fname}" do
-    source "#{fname}.erb"
-    owner "root"
-    group "root"
-    mode "755"
-    variables :db => node[:nominatim][:dbname]
-  end
-end
-
-## webserver frontend
-
-directory "#{basedir}/etc" do
-  owner "nominatim"
-  group "adm"
-  mode "775"
-end
+# Webserver + frontend
 
 %w[user_agent referrer email generic].each do |name|
-  file "#{basedir}/etc/nginx_blocked_#{name}.conf" do
+  file "#{cfg_directory}/nginx_blocked_#{name}.conf" do
     action :create_if_missing
     owner "nominatim"
     group "adm"
@@ -431,7 +285,7 @@ frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
 
 nginx_site "nominatim" do
   template "nginx.erb"
-  directory build_directory
+  directory project_directory
   variables :pools => node[:nominatim][:fpm_pools],
             :frontends => frontends,
             :confdir => "#{basedir}/etc",
@@ -445,54 +299,70 @@ template "/etc/logrotate.d/nginx" do
   mode "644"
 end
 
-munin_plugin_conf "nominatim" do
-  template "munin.erb"
-  variables :db => node[:nominatim][:dbname],
-            :querylog => "#{node[:nominatim][:logdir]}/query.log"
-end
+# Updates
 
-munin_plugin "nominatim_importlag" do
-  target "#{source_directory}/munin/nominatim_importlag"
+%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
 
-munin_plugin "nominatim_query_speed" do
-  target "#{source_directory}/munin/nominatim_query_speed_querylog"
+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
 
-munin_plugin "nominatim_requests" do
-  target "#{source_directory}/munin/nominatim_requests_querylog"
+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
 
-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]}"
-  ]
+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
 
-directory "#{basedir}/status" do
-  owner "nominatim"
-  group "postgres"
-  mode "775"
+service "nominatim-update-maintenance-trigger" do
+  action node[:nominatim][:state] != "off" ? :enable : :disable
 end
 
-include_recipe "fail2ban"
+# Nominatim UI
 
-frontend_addresses = frontends.collect { |f| f.ipaddresses(:role => :external) }
+git ui_directory do
+  action :sync
+  repository node[:nominatim][:ui_repository]
+  revision node[:nominatim][:ui_revision]
+  user "nominatim"
+  group "nominatim"
+end
 
-fail2ban_jail "nominatim_limit_req" do
-  filter "nginx-limit-req"
-  logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
-  ports [80, 443]
-  maxretry 20
-  ignoreips frontend_addresses.flatten.sort
+template "#{ui_directory}/dist/theme/config.theme.js" do
+  source "ui-config.js.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode "664"
 end
 
-### QA tile generation
+# Nominatim QA
 
 if node[:nominatim][:enable_qa_tiles]
   package "python3-geojson"
@@ -540,3 +410,119 @@ if node[:nominatim][:enable_qa_tiles]
   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
+
+munin_plugin_conf "nominatim" do
+  template "munin.erb"
+  variables :db => node[:nominatim][:dbname],
+            :querylog => "#{node[:nominatim][:logdir]}/query.log"
+end
+
+munin_plugin "nominatim_importlag" do
+  target "#{source_directory}/munin/nominatim_importlag"
+end
+
+munin_plugin "nominatim_query_speed" do
+  target "#{source_directory}/munin/nominatim_query_speed_querylog"
+end
+
+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
+
+include_recipe "fail2ban"
+
+frontend_addresses = frontends.collect { |f| f.ipaddresses(:role => :external) }
+
+fail2ban_jail "nominatim_limit_req" do
+  filter "nginx-limit-req"
+  logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
+  ports [80, 443]
+  maxretry 20
+  ignoreips frontend_addresses.flatten.sort
+end
diff --git a/cookbooks/nominatim/recipes/version4.rb b/cookbooks/nominatim/recipes/version4.rb
deleted file mode 100644 (file)
index 7b218d9..0000000
+++ /dev/null
@@ -1,528 +0,0 @@
-#
-# Cookbook:: nominatim
-# Recipe:: base
-#
-# Copyright:: 2015, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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"]
-
-directory basedir do
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  recursive true
-end
-
-## Log directory setup
-
-directory node[:nominatim][:logdir] do
-  owner "nominatim"
-  group "nominatim"
-  mode "755"
-  recursive true
-end
-
-file "#{node[:nominatim][:logdir]}/query.log" do
-  action :create_if_missing
-  owner "www-data"
-  group "adm"
-  mode "664"
-end
-
-file "#{node[:nominatim][:logdir]}/update.log" do
-  action :create_if_missing
-  owner "nominatim"
-  group "adm"
-  mode "664"
-end
-
-## 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
-
-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
-
-postgresql_munin "nominatim" do
-  cluster node[:nominatim][:dbcluster]
-  database node[:nominatim][:dbname]
-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
-  end
-
-  link "#{basedir}/tablespaces/#{name}" do
-    to location
-  end
-
-  postgresql_tablespace name do
-    cluster node[:nominatim][:dbcluster]
-    location "#{basedir}/tablespaces/#{name}"
-  end
-end
-
-## Nominatim backend
-
-include_recipe "git"
-
-package %w[
-  build-essential
-  cmake
-  g++
-  libboost-dev
-  libboost-system-dev
-  libboost-filesystem-dev
-  libexpat1-dev
-  zlib1g-dev
-  libbz2-dev
-  libpq-dev
-  libproj-dev
-  python3-pyosmium
-  python3-psycopg2
-  python3-dotenv
-  python3-psutil
-  python3-jinja2
-  python3-icu
-  python3-datrie
-  python3-yaml
-  php-pgsql
-  php-intl
-  ruby
-  ruby-file-tail
-  ruby-pg
-  ruby-webrick
-]
-
-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
-
-# 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
-
-remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
-  action :create_if_missing
-  source "https://www.nominatim.org/data/country_grid.sql.gz"
-  owner "nominatim"
-  group "nominatim"
-  mode "644"
-end
-
-execute "compile_nominatim" do
-  action :nothing
-  user "nominatim"
-  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
-
-# 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]
-end
-
-%w[wikimedia-importance.sql.gz gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
-  remote_file "#{project_directory}/#{fname}" do
-    action :create
-    source "https://www.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
-
-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
-
-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
-
-include_recipe "nginx"
-
-nginx_site "default" do
-  action [:delete]
-end
-
-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
-
-template "/etc/logrotate.d/nginx" do
-  source "logrotate.nginx.erb"
-  owner "root"
-  group "root"
-  mode "644"
-end
-
-# 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
-
-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
-
-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
-
-# 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 "664"
-end
-
-# Nominatim QA
-
-if node[:nominatim][:enable_qa_tiles]
-  package "python3-geojson"
-
-  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
-
-munin_plugin_conf "nominatim" do
-  template "munin.erb"
-  variables :db => node[:nominatim][:dbname],
-            :querylog => "#{node[:nominatim][:logdir]}/query.log"
-end
-
-munin_plugin "nominatim_importlag" do
-  target "#{source_directory}/munin/nominatim_importlag"
-end
-
-munin_plugin "nominatim_query_speed" do
-  target "#{source_directory}/munin/nominatim_query_speed_querylog"
-end
-
-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
-
-include_recipe "fail2ban"
-
-frontend_addresses = frontends.collect { |f| f.ipaddresses(:role => :external) }
-
-fail2ban_jail "nominatim_limit_req" do
-  filter "nginx-limit-req"
-  logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
-  ports [80, 443]
-  maxretry 20
-  ignoreips frontend_addresses.flatten.sort
-end
diff --git a/cookbooks/nominatim/templates/default/git-post-merge-hook.erb b/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
deleted file mode 100644 (file)
index df72efe..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-cd <%= @srcdir %>
-
-git submodule update
-
-cd <%= @builddir %>
-
-cmake <%= @srcdir %> &&
-make
-
-psql -d <%= @dbname %> -c "SELECT version();" >/dev/null 2>&1
-if [[ "$?" == "0" ]]; then
-  nominatim admin --migrate
-  nominatim refresh --functions --address-levels --website
-fi
diff --git a/cookbooks/nominatim/templates/default/ipblocks.erb b/cookbooks/nominatim/templates/default/ipblocks.erb
deleted file mode 100644 (file)
index 9fb36fe..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-LOGFILE='<%= node[:nominatim][:logdir] %>/restricted_ips.log'
-# space-separated list of IPs that are never banned
-WHITELIST = ''
-# space-separated list of IPs manually blocked
-BLACKLIST = ''
-# user-agents that should be blocked from bulk mode
-# (matched with startswith)
-UA_BLOCKLIST = ()
-
-# time before a automatically blocked IP is allowed back
-BLOCKCOOLOFF_PERIOD='1 hour'
-# quiet time before an IP is released from the bulk pool
-BULKCOOLOFF_PERIOD='15 min'
-
-BULKLONG_LIMIT=8000
-BULKSHORT_LIMIT=2000
-BLOCK_UPPER=19000
-BLOCK_LOWER=4000
-BLOCK_LOADFAC=380
-BULK_LOADFAC=160
-BULK_LOWER=1500
-MAX_BULK_IPS=85
-
diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
deleted file mode 100644 (file)
index c83d769..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash -e
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-# Change to Nominatim directory
-cd <%= @bindir %>
-
-num_cpus=`cat /proc/cpuinfo | grep -c processor`
-num_cpus=$((num_cpus - 2))
-
-while [ ! -f "<%= @update_stop_file %>" ]
-do
-    # Send output to the log (logrotatable)
-    exec >> <%= @logfile %> 2>&1
-
-    current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`
-
-    if [[ $current_load -lt $num_cpus ]]
-    then
-        INST=4
-    else
-        INST=2
-    fi
-
-    ./nominatim replication --once --threads $INST
-
-<% if node[:nominatim][:enable_git_updates] -%>
-    pushd <%= @srcdir %>
-    if git fetch origin; then
-      # will trigger recompilation if necessary
-      git merge origin/<%= @branch %>
-    else
-      echo "WARNING: git fetch failed."
-    fi
-    popd
-<% end -%>
-
-    if [ -f "<%= @update_maintenance_trigger %>" ]; then
-        rm <%= @update_maintenance_trigger %>
-        ./nominatim refresh --postcodes --word-tokens --threads 4 -v
-<% if node[:nominatim][:enable_qa_tiles] -%>
-        pushd <%= @qabindir %>
-        if python3 cli.py --execute-all; then
-          rm -rf "<%= @qadatadir %>/old"
-          if [ -d "<%= @qadatadir %>/current" ]; then
-            mv "<%= @qadatadir %>/current" "<%= @qadatadir %>/old"
-          fi
-          mv "<%= @qadatadir %>/new" "<%= @qadatadir %>/current"
-        fi
-        popd
-<% end -%>
-    fi
-done
diff --git a/cookbooks/nominatim/templates/default/updater.init.erb b/cookbooks/nominatim/templates/default/updater.init.erb
deleted file mode 100644 (file)
index cafc825..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-start() {
-  start-stop-daemon --start --chuid nominatim --background --make-pidfile --pidfile /var/run/nominatim-update.pid --exec <%= @source_directory %>/utils/nominatim-update
-}
-
-stop() {
-  start-stop-daemon --stop --retry 3600 --pidfile /var/run/nominatim-update.pid
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    stop || exit $?
-    start
-    ;;
-esac
-
index 00592b8c85055618609716484a1863c46bb2e283..b3f864c6a08ad7f3a133d1bed341f0680b5df3a4 100644 (file)
@@ -48,5 +48,5 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )
index da3e92c194afba76b4ed38b747b0e024d98d3743..f8ff9cd871085fde7af8f407d4c064da88c0a24e 100644 (file)
@@ -58,5 +58,5 @@ default_attributes(
 
 run_list(
   "role[equinix-dub]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )
diff --git a/roles/nominatim-v4.rb b/roles/nominatim-v4.rb
deleted file mode 100644 (file)
index 69b620e..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-name "nominatim-v4"
-description "Role applied to all nominatim servers. For Nominatim 4."
-
-default_attributes(
-  :accounts => {
-    :users => {
-      :lonvia => { :status => :administrator },
-      :nominatim => {
-        :status => :role,
-        :members => [:lonvia, :tomh]
-      }
-    }
-  },
-  :networking => {
-    :firewall => {
-      :http_rate_limit => "s:2/sec:15"
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :max_connections => "450",
-        :synchronous_commit => "off",
-        :checkpoint_segments => "32",
-        :checkpoint_timeout => "10min",
-        :checkpoint_completion_target => "0.9",
-        :jit => "off",
-        :shared_buffers => "2GB",
-        :autovacuum_max_workers => "1",
-        :max_parallel_workers_per_gather => "0",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
-      }
-    },
-    :swappiness => {
-      :comment => "Reduce swap usage",
-      :parameters => {
-        "vm.swappiness" => 10
-      }
-    },
-    :network_conntrack_time_wait => {
-      :comment => "Only track completed connections for 30 seconds",
-      :parameters => {
-        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
-      }
-    },
-    :network_conntrack_max => {
-      :comment => "Increase max number of connections tracked",
-      :parameters => {
-        "net.netfilter.nf_conntrack_max" => "196608"
-      }
-    }
-  },
-  :nominatim => {
-    :dbadmins => %w[lonvia tomh],
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
-  }
-)
-
-run_list(
-  "recipe[nominatim::version4]"
-)
index 36140c371374383a91d657ecabb5100d499367ca..d16fa71ad041d6ad5f5cf65f53e64f349e86241b 100644 (file)
@@ -51,5 +51,5 @@ default_attributes(
 
 run_list(
   "role[ucl]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )
index 218717bed46dde9fa7730d71f87d3aad80387a18..ade67133a9331fd758a4e094db7ad6eb3e9b9c9a 100644 (file)
@@ -52,5 +52,5 @@ run_list(
   "role[osuosl]",
   "role[hp-g9]",
   "role[geodns]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )