Use PHP 7.2 for Nominatim on 18.04

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index ebcc5d7835ccf24b46659e5858c1d5a2fa40d562..f424061affff9f7182e2b60083bdb8bb5030fcc4 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 # Cookbook Name:: nominatim
 #
 # Cookbook Name:: nominatim

-# Recipe:: default
+# Recipe:: base

 #
 #

-# Copyright 2012, 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.
 # You may obtain a copy of the License at
 #
 #
 # 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
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,218 +17,371 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
-include_recipe "postgresql"
-include_recipe "git"
-
-package "php5"
-package "php5-cli"
-package "php5-pgsql"
-package "php5-fpm"
-package "php-pear"
-package "php-apc"
-
-apache_module "rewrite"
-apache_module "proxy"
-apache_module "proxy_fcgi"
-
-home_directory = data_bag_item("accounts", "nominatim")["home"]
-source_directory = "#{home_directory}/nominatim"
+basedir = data_bag_item("accounts", "nominatim")["home"]

 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

-database_cluster = node[:nominatim][:database][:cluster]
-database_version = database_cluster.sub(/\/.*/, "")
-database_name = node[:nominatim][:database][:dbname]
-
-postgis_version = node[:nominatim][:database][:postgis]
-
-service "php5-fpm" do
-  provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+directory basedir do
+  owner "nominatim"
+  group "nominatim"
+  mode 0o755
+  recursive true

 end
 
 end
 

-apache_site "nominatim.openstreetmap.org" do
-  template "apache.erb"
-  directory source_directory
-  variables :pools => node[:nominatim][:fpm_pools]
+directory node[:nominatim][:logdir] do
+  owner "nominatim"
+  group "nominatim"
+  mode 0o755
+  recursive true

 end
 
 end
 

-apache_site "default" do
-  action [ :disable ]
+file "#{node[:nominatim][:logdir]}/query.log" do
+  action :create_if_missing
+  owner "www-data"
+  group "adm"
+  mode 0o664

 end
 
 end
 

-node[:nominatim][:fpm_pools].each do |name,data|
-  template "/etc/php5/fpm/pool.d/#{name}.conf" do
-    source "fpm.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    variables data.merge(:name => name, :port => data[:port])
-    notifies :reload, "service[php5-fpm]"
-  end
+file "#{node[:nominatim][:logdir]}/update.log" do
+  action :create_if_missing
+  owner "nominatim"
+  group "adm"
+  mode 0o664

 end
 
 end
 

-postgresql_user "tomh" do
-  cluster database_cluster
-  superuser true
-end
+## Postgresql

 
 

-postgresql_user "lonvia" do
-  cluster database_cluster
-  superuser true
-end
+include_recipe "postgresql"

 
 

-postgresql_user "twain" do
-  cluster database_cluster
-  superuser true
+postgresql_version = node[:nominatim][:dbcluster].split("/").first
+
+package "postgis"
+package "postgresql-#{postgresql_version}-postgis-2.3"
+
+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
 end
 
 postgresql_user "nominatim" do

-  cluster database_cluster
+  cluster node[:nominatim][:dbcluster]

   superuser true
   superuser true

+  only_if { node[:nominatim][:state] != "slave" }

 end
 
 postgresql_user "www-data" do
 end
 
 postgresql_user "www-data" do

-  cluster database_cluster
+  cluster node[:nominatim][:dbcluster]
+  only_if { node[:nominatim][:state] != "slave" }

 end
 
 postgresql_munin "nominatim" do
 end
 
 postgresql_munin "nominatim" do

-  cluster database_cluster
-  database database_name
+  cluster node[:nominatim][:dbcluster]
+  database node[:nominatim][:dbname]

 end
 
 end
 

-directory "/var/log/nominatim" do
-  owner "nominatim"
-  group "nominatim"
-  mode 0755
+directory "#{basedir}/tablespaces" do
+  owner "postgres"
+  group "postgres"
+  mode 0o700

 end
 
 end
 

-template "/etc/logrotate.d/nominatim" do
-  source "logrotate.nominatim.erb"
-  owner "root"
-  group "root"
-  mode 0644
+# 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 0o700
+    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
 
 end
 

+if node[:nominatim][:state] == "master" # ~FC023
+  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 0o700
+  end
+
+  template "/usr/local/bin/clean-db-nominatim" do
+    source "clean-db-nominatim.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+    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"
+include_recipe "python"

 
 

-package "osmosis"
-package "gcc"
-package "proj-bin"
-package "libgeos-c1"
-package "postgresql-#{database_version}-postgis-#{postgis_version}"
-package "postgresql-server-dev-#{database_version}"

 package "build-essential"
 package "build-essential"

+package "cmake"
+package "g++"
+package "libboost-dev"
+package "libboost-system-dev"
+package "libboost-filesystem-dev"
+package "libboost-python-dev"
+package "libexpat1-dev"
+package "zlib1g-dev"

 package "libxml2-dev"
 package "libxml2-dev"

-package "libgeos-dev"
-package "libgeos++-dev"
-package "libpq-dev"

 package "libbz2-dev"
 package "libbz2-dev"

-package "libtool"
-package "automake"
+package "libpq-dev"
+package "libgeos++-dev"

 package "libproj-dev"
 package "libproj-dev"

-package "libprotobuf-c0-dev"
-package "protobuf-c-compiler"
-package "python-psycopg2"
+package "osmosis"

 
 

-execute "php-pear-db" do
-  command "pear install DB"
-  not_if { File.exists?("/usr/share/php/DB") }
-end
+python_package "osmium"

 
 

-execute "compile_nominatim" do
-  action :nothing
-  command "cd #{source_directory} && ./autogen.sh && ./configure && make"
-  user "nominatim"
+source_directory = "#{basedir}/nominatim"
+build_directory = "#{basedir}/bin"
+
+directory build_directory do
+  owner "nominatim"
+  group "nominatim"
+  mode 0o755
+  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
 git source_directory do

-  action :checkout
+  action node[:nominatim][:state] == "slave" ? :sync : :checkout

   repository node[:nominatim][:repository]
   repository node[:nominatim][:repository]

+  revision node[:nominatim][:revision]

   enable_submodules true
   user "nominatim"
   group "nominatim"
   enable_submodules true
   user "nominatim"
   group "nominatim"

-  notifies :run, "execute[compile_nominatim]"
+  not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
+  notifies :run, "execute[compile_nominatim]", :immediately

 end
 
 end
 

-directory "#{source_directory}/log" do
+execute "compile_nominatim" do
+  action :nothing
+  user "nominatim"
+  cwd build_directory
+  command "cmake #{source_directory} && make"
+end
+
+template "#{source_directory}/.git/hooks/post-merge" do
+  source "git-post-merge-hook.erb"

   owner "nominatim"
   group "nominatim"
   owner "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755
+  variables :srcdir => source_directory,
+            :builddir => build_directory,
+            :dbname => node[:nominatim][:dbname]

 end
 
 end
 

+template "#{build_directory}/settings/local.php" do
+  source "settings.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode 0o664
+  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"
+end

 
 

-template "#{source_directory}/.git/hooks/post-merge" do
-  source "update_source.erb"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0755
-  variables :source_directory => source_directory
+if node[:nominatim][:flatnode_file] # ~FC023
+  directory File.dirname(node[:nominatim][:flatnode_file]) do
+    recursive true
+  end

 end
 
 end
 

-template "#{source_directory}/settings/local.php" do
-  source "nominatim.erb"
+template "/etc/logrotate.d/nominatim" do
+  source "logrotate.nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+external_data = [
+  "wikipedia_article.sql.bin",
+  "wikipedia_redirect.sql.bin",
+  "gb_postcode_data.sql.gz"
+]
+
+external_data.each do |fname|
+  remote_file "#{source_directory}/data/#{fname}" do
+    action :create_if_missing
+    source "https://www.nominatim.org/data/#{fname}"
+    owner "nominatim"
+    group "nominatim"
+    mode 0o644
+  end
+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"
   owner "nominatim"
   group "nominatim"

-  mode 0664
-  variables :postgres_version => database_version
+  mode 0o644
+end
+
+template "/etc/cron.d/nominatim" do
+  action node[:nominatim][:state] == :off ? :delete : :create
+  source "nominatim.cron.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+  variables :bin_directory => "#{source_directory}/utils",
+            :mailto => email_errors,
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
+end
+
+template "#{source_directory}/utils/nominatim-update" do
+  source "updater.erb"
+  user "nominatim"
+  group "nominatim"
+  mode 0o755
+  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"

 end
 
 end
 

-template "#{source_directory}/settings/ip_blocks.conf" do
+template "/etc/init.d/nominatim-update" do
+  source "updater.init.erb"
+  user "nominatim"
+  group "nominatim"
+  mode 0o755
+  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 0o755
+    variables :db => node[:nominatim][:dbname]
+  end
+end
+
+## webserver frontend
+
+template "#{build_directory}/settings/ip_blocks.conf" do

   action :create_if_missing
   source "ipblocks.erb"
   owner "nominatim"
   group "nominatim"
   action :create_if_missing
   source "ipblocks.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 end
 

-file "#{source_directory}/settings/apache_blocks.conf" do
+file "#{build_directory}/settings/apache_blocks.conf" do

   action :create_if_missing
   owner "nominatim"
   group "nominatim"
   action :create_if_missing
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 end
 

-file "#{source_directory}/settings/ip_blocks.map" do
+file "#{build_directory}/settings/ip_blocks.map" do

   action :create_if_missing
   owner "nominatim"
   group "nominatim"
   action :create_if_missing
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 end
 

-if node[:nominatim][:enabled]
-  cron_action = :create
-else
-  cron_action = :delete
+include_recipe "apache"
+
+package "php"
+package "php-fpm"
+package "php-pgsql"
+package "php-pear"
+package "php-db"
+package "php-intl"
+
+apache_module "rewrite"
+apache_module "proxy"
+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
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true

 end
 
 end
 

-template "/etc/cron.d/nominatim" do
-  action cron_action
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode "0644"
-  variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
+node[:nominatim][:fpm_pools].each do |name, data|
+  template "/etc/php/#{php_version}/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]"
+  end

 end
 
 end
 

+ssl_certificate "nominatim.openstreetmap.org" do
+  domains ["nominatim.openstreetmap.org",
+           "nominatim.osm.org",
+           "nominatim.openstreetmap.com",
+           "nominatim.openstreetmap.net",
+           "nominatim.openstreetmaps.org",
+           "nominatim.openmaps.org"]
+  notifies :reload, "service[apache2]"
+end

 
 

-template "#{source_directory}/utils/nominatim-update" do
-  source "updater.erb"
-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
+apache_site "nominatim.openstreetmap.org" do
+  template "apache.erb"
+  directory build_directory
+  variables :pools => node[:nominatim][:fpm_pools]

 end
 
 end
 

-template "/etc/init.d/nominatim-update" do
-  source "updater.init.erb"
-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
-  variables :source_directory => source_directory
+apache_site "default" do
+  action [:disable]

 end
 
 end
 

+template "/etc/logrotate.d/apache2" do
+  source "logrotate.apache.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+include_recipe "fail2ban"
+

 munin_plugin_conf "nominatim" do
   template "munin.erb"
 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
 end
 
 munin_plugin "nominatim_importlag" do


@@ -247,41 +400,8 @@ munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 

-remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/wikipedia_article.sql.bin"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
-end
-
-remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
-end
-
-remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/gb_postcode_data.sql.gz"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
-end
-
-template "/usr/local/bin/backup-nominatim" do
-  source "backup-nominatim.erb"
-  owner "root"
-  group "root"
-  mode 0755
-end
-
-directory File.dirname(node[:nominatim][:flatnode_file]) do
+directory "#{basedir}/status" do

   owner "nominatim"
   owner "nominatim"

-  group "nominatim"
-  mode 0755
-  recursive true
+  group "postgres"
+  mode 0o775

 end
 end

-