Merge remote-tracking branch 'github/pull/263'

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 976bdb4c2b58a8fc51c28ac6ed96d105ddff88d5..1cd8d767e2e496f0dff1f2a56db7094221026545 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: nominatim
+# Cookbook:: nominatim

 # Recipe:: base
 #
 # 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.
 # 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,


@@ -20,6 +20,13 @@
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

+directory basedir do
+  owner "nominatim"
+  group "nominatim"
+  mode 0o755
+  recursive true
+end
+

 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"


@@ -45,7 +52,10 @@ end
 
 include_recipe "postgresql"
 
 
 include_recipe "postgresql"
 

-package "postgis"
+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
 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do


@@ -98,7 +108,7 @@ node[:nominatim][:tablespaces].each do |name, location|
   end
 end
 
   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"]
   postgresql_user "replication" do
     cluster node[:nominatim][:dbcluster]
     password data_bag_item("nominatim", "passwords")["replication"]


@@ -126,20 +136,24 @@ end
 
 include_recipe "git"
 
 
 include_recipe "git"
 

-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"
+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"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"


@@ -163,6 +177,7 @@ git source_directory do
   enable_submodules true
   user "nominatim"
   group "nominatim"
   enable_submodules true
   user "nominatim"
   group "nominatim"

+  not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }

   notifies :run, "execute[compile_nominatim]", :immediately
 end
 
   notifies :run, "execute[compile_nominatim]", :immediately
 end
 


@@ -194,7 +209,7 @@ template "#{build_directory}/settings/local.php" do
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 
             :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
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
   end


@@ -208,28 +223,37 @@ template "/etc/logrotate.d/nominatim" do
 end
 
 external_data = [
 end
 
 external_data = [

-  "wikipedia_article.sql.bin",
-  "wikipedia_redirect.sql.bin",
+  "wikimedia-importance.sql.gz",

   "gb_postcode_data.sql.gz"
 ]
 
 external_data.each do |fname|
   remote_file "#{source_directory}/data/#{fname}" do
     action :create_if_missing
   "gb_postcode_data.sql.gz"
 ]
 
 external_data.each do |fname|
   remote_file "#{source_directory}/data/#{fname}" do
     action :create_if_missing

-    source "http://www.nominatim.org/data/#{fname}"
+    source "https://www.nominatim.org/data/#{fname}"

     owner "nominatim"
     group "nominatim"
     mode 0o644
   end
 end
 
     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"
+  mode 0o644
+end
+

 template "/etc/cron.d/nominatim" do
 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"
   mode "0644"
   source "nominatim.cron.erb"
   owner "root"
   group "root"
   mode "0644"

-  variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
+  variables :bin_directory => "#{source_directory}/utils",
+            :mailto => email_errors,
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"

 end
 
 template "#{source_directory}/utils/nominatim-update" do
 end
 
 template "#{source_directory}/utils/nominatim-update" do


@@ -241,7 +265,8 @@ template "#{source_directory}/utils/nominatim-update" do
             :srcdir => source_directory,
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :srcdir => source_directory,
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],

-            :update_stop_file => "#{basedir}/status/updates_disabled"
+            :update_stop_file => "#{basedir}/status/updates_disabled",
+            :update_maintenance_trigger => "#{basedir}/status/update_maintenance"

 end
 
 template "/etc/init.d/nominatim-update" do
 end
 
 template "/etc/init.d/nominatim-update" do


@@ -252,7 +277,7 @@ template "/etc/init.d/nominatim-update" do
   variables :source_directory => source_directory
 end
 
   variables :source_directory => source_directory
 end
 

-%w(backup-nominatim vacuum-db-nominatim).each do |fname|
+%w[backup-nominatim vacuum-db-nominatim].each do |fname|

   template "/usr/local/bin/#{fname}" do
     source "#{fname}.erb"
     owner "root"
   template "/usr/local/bin/#{fname}" do
     source "#{fname}.erb"
     owner "root"


@@ -286,13 +311,12 @@ file "#{build_directory}/settings/ip_blocks.map" do
   mode 0o664
 end
 
   mode 0o664
 end
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 package "php"
 package "php-fpm"
 package "php-pgsql"
 
 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 "rewrite"
 apache_module "proxy"


@@ -300,34 +324,44 @@ apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 
 apache_module "proxy_http"
 apache_module "headers"
 

-service "php5-fpm" do
-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-    service_name "php7.0-fpm"
-  elsif node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
+service "php7.2-fpm" do

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 

-php_confdir = node[:lsb][:release].to_f >= 15.10 ? "/etc/php/7.0" : "/etc/php5"
-

 node[:nominatim][:fpm_pools].each do |name, data|
 node[:nominatim][:fpm_pools].each do |name, data|

-  template "#{php_confdir}/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)
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)

-    notifies :reload, "service[php5-fpm]"
+    notifies :reload, "service[php7.2-fpm]"

   end
 end
 
   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",
+           "nominatim.openstreetmap.com",
+           "nominatim.openstreetmap.net",
+           "nominatim.openstreetmaps.org",
+           "nominatim.openmaps.org"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools]
 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
 end
 
 apache_site "default" do


@@ -343,17 +377,6 @@ end
 
 include_recipe "fail2ban"
 
 
 include_recipe "fail2ban"
 

-fail2ban_filter "nominatim" do
-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
-end
-
-fail2ban_jail "nominatim" do
-  filter "nominatim"
-  logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
-  ports [80, 443]
-  maxretry 100
-end
-

 munin_plugin_conf "nominatim" do
   template "munin.erb"
   variables :db => node[:nominatim][:dbname],
 munin_plugin_conf "nominatim" do
   template "munin.erb"
   variables :db => node[:nominatim][:dbname],