dulcy: switch to postgresql 12

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 0d99a5cab374c8897efd62d1c27548f0a4cba5f8..e38d0c993a4edc682dcc7e338a37acbfd7e95101 100644 (file)
--- 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.
@@ -55,7 +55,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 +108,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 +135,24 @@ 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
+]
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
@@ -214,7 +208,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 +222,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"
 ]
 
@@ -322,8 +315,6 @@ include_recipe "apache"
 package "php"
 package "php-fpm"
 package "php-pgsql"
-package "php-pear"
-package "php-db"
 package "php-intl"
 
 apache_module "rewrite"
@@ -348,6 +339,13 @@ node[:nominatim][:fpm_pools].each do |name, data|
   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",
@@ -362,6 +360,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