X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7007a32e4f0133e7b33435746b19aa9c4de10985..d66a20bd589ea54a66ddfb8ae906ef2ab6392281:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 5dedfd4e7..92ac51620 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -52,7 +52,10 @@ end
 
 include_recipe "postgresql"
 
+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
@@ -132,6 +135,7 @@ end
 ## Nominatim backend
 
 include_recipe "git"
+include_recipe "python"
 
 package "build-essential"
 package "cmake"
@@ -139,6 +143,7 @@ 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"
@@ -148,6 +153,8 @@ package "libgeos++-dev"
 package "libproj-dev"
 package "osmosis"
 
+python_package "osmium"
+
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 
@@ -170,6 +177,7 @@ git source_directory do
   enable_submodules true
   user "nominatim"
   group "nominatim"
+  not_if { node[:nominatim][:state] != "slave" and File.exist?("#{source_directory}/README.md") }
   notifies :run, "execute[compile_nominatim]", :immediately
 end
 
@@ -230,6 +238,14 @@ external_data.each do |fname|
   end
 end
 
+remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
+  action :create_if_missing
+  source "http://www.nominatim.org/data/country_grid.sql.gz"
+  owner "nominatim"
+  group "nominatim"
+  mode 0o644
+end
+
 template "/etc/cron.d/nominatim" do
   action node[:nominatim][:state] == :off ? :delete : :create
   source "nominatim.cron.erb"
@@ -259,7 +275,7 @@ template "/etc/init.d/nominatim-update" do
   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"
@@ -300,6 +316,7 @@ package "php-fpm"
 package "php-pgsql"
 package "php-pear"
 package "php-db"
+package "php-intl"
 
 apache_module "rewrite"
 apache_module "proxy"
@@ -352,8 +369,12 @@ end
 
 include_recipe "fail2ban"
 
+web_servers = search(:node, "recipes:web\\:\\:frontend").collect do |n| # ~FC010
+  n.ipaddresses(:role => :external)
+end.flatten
+
 fail2ban_filter "nominatim" do
-  failregex '^<HOST> - - \[\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" (408|429) '
 end
 
 fail2ban_jail "nominatim" do
@@ -361,6 +382,7 @@ fail2ban_jail "nominatim" do
   logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
   ports [80, 443]
   maxretry 100
+  ignoreips web_servers
 end
 
 munin_plugin_conf "nominatim" do