X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0cb7f764b5c8d66c0aa73841b98647b21c35d190..e26014200863b3118f65f48175260fa05768bcb7:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3c9ccbc61..0a245969c 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: nominatim
+# Cookbook:: nominatim
 # Recipe:: base
 #
-# Copyright 2015, OpenStreetMap Foundation
+# 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.
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
@@ -55,7 +57,6 @@ include_recipe "postgresql"
 postgresql_version = node[:nominatim][:dbcluster].split("/").first
 postgis_version = node[:nominatim][:postgis]
 
-package "postgis"
 package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 node[:nominatim][:dbadmins].each do |user|
@@ -109,7 +110,7 @@ node[:nominatim][:tablespaces].each do |name, location|
   end
 end
 
-if node[:nominatim][:state] == "master" # ~FC023
+if node[:nominatim][:state] == "master"
   postgresql_user "replication" do
     cluster node[:nominatim][:dbcluster]
     password data_bag_item("nominatim", "passwords")["replication"]
@@ -136,29 +137,25 @@ end
 ## Nominatim backend
 
 include_recipe "git"
-include_recipe "python"
-
-package "build-essential"
-package "cmake"
-package "g++"
-package "libboost-dev"
-package "libboost-system-dev"
-package "libboost-filesystem-dev"
-package "libexpat1-dev"
-package "zlib1g-dev"
-package "libxml2-dev"
-package "libbz2-dev"
-package "libpq-dev"
-package "libgeos++-dev"
-package "libproj-dev"
-package "osmosis"
-
-if node[:lsb][:release].to_f >= 18.04
-  package "pyosmium"
-else
-  package "libboost-python-dev"
-  python_package "osmium"
-end
+
+package %w[
+  build-essential
+  cmake
+  g++
+  libboost-dev
+  libboost-system-dev
+  libboost-filesystem-dev
+  libexpat1-dev
+  zlib1g-dev
+  libxml2-dev
+  libbz2-dev
+  libpq-dev
+  libgeos++-dev
+  libproj-dev
+  python3-pyosmium
+  pyosmium
+  python3-psycopg2
+]
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
@@ -214,7 +211,7 @@ template "#{build_directory}/settings/local.php" do
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 
-if node[:nominatim][:flatnode_file] # ~FC023
+if node[:nominatim][:flatnode_file]
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
   end
@@ -228,8 +225,7 @@ template "/etc/logrotate.d/nominatim" do
 end
 
 external_data = [
-  "wikipedia_article.sql.bin",
-  "wikipedia_redirect.sql.bin",
+  "wikimedia-importance.sql.gz",
   "gb_postcode_data.sql.gz"
 ]
 
@@ -252,7 +248,7 @@ remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
 end
 
 template "/etc/cron.d/nominatim" do
-  action node[:nominatim][:state] == :off ? :delete : :create
+  action node[:nominatim][:state] == "off" ? :delete : :create
   source "nominatim.cron.erb"
   owner "root"
   group "root"
@@ -322,8 +318,6 @@ include_recipe "apache"
 package "php"
 package "php-fpm"
 package "php-pgsql"
-package "php-pear"
-package "php-db"
 package "php-intl"
 
 apache_module "rewrite"
@@ -332,28 +326,29 @@ apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 
-php_version = if node[:lsb][:release].to_f >= 18.04
-                "7.2"
-              else
-                "7.0"
-              end
-
-service "php#{php_version}-fpm" do
+service "php7.2-fpm" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
-  template "/etc/php/#{php_version}/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)
-    notifies :reload, "service[php#{php_version}-fpm]"
+    notifies :reload, "service[php7.2-fpm]"
   end
 end
 
+systemd_service "apache-nominatim" do
+  service "apache2"
+  dropin "nominatim"
+  tasks_max 12000
+  notifies :restart, "service[apache2]"
+end
+
 ssl_certificate "nominatim.openstreetmap.org" do
   domains ["nominatim.openstreetmap.org",
            "nominatim.osm.org",
@@ -368,6 +363,7 @@ apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools]
+  only_if { node[:nominatim][:state] != "off" }
 end
 
 apache_site "default" do