X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f2eac4110bc6ac4a5627216998e92312276e2321..51cef88ffafde1cbe77daf204aa347bdc470540f:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 9285e5ad5..128bb34cf 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -8,7 +8,7 @@ # 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, @@ -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 @@ -140,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" @@ -173,6 +177,7 @@ git source_directory do 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 @@ -226,20 +231,30 @@ external_data = [ 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 +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 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 + variables :bin_directory => "#{source_directory}/utils", + :mailto => email_errors, + :update_maintenance_trigger => "#{basedir}/status/update_maintenance" end template "#{source_directory}/utils/nominatim-update" do @@ -251,7 +266,8 @@ template "#{source_directory}/utils/nominatim-update" do :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 @@ -262,7 +278,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" @@ -303,13 +319,13 @@ 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" -apache_module "reqtimeout" service "php7.0-fpm" do action [:enable, :start] @@ -356,22 +372,6 @@ 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 '^ - - \[\] "[^"]+" (408|429) ' -end - -fail2ban_jail "nominatim" do - filter "nominatim" - logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log" - ports [80, 443] - maxretry 100 - ignoreips web_servers -end - munin_plugin_conf "nominatim" do template "munin.erb" variables :db => node[:nominatim][:dbname],