X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d66a20bd589ea54a66ddfb8ae906ef2ab6392281..5dea55cbbebb12ce1526c6401ad551ccd8d496dd:/cookbooks/nominatim/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 92ac51620..43982b751 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, @@ -53,9 +53,10 @@ end include_recipe "postgresql" postgresql_version = node[:nominatim][:dbcluster].split("/").first +postgis_version = node[:nominatim][:postgis] package "postgis" -package "postgresql-#{postgresql_version}-postgis-2.3" +package "postgresql-#{postgresql_version}-postgis-#{postgis_version}" node[:nominatim][:dbadmins].each do |user| postgresql_user user do @@ -135,25 +136,23 @@ 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 "libboost-python-dev" -package "libexpat1-dev" -package "zlib1g-dev" -package "libxml2-dev" -package "libbz2-dev" -package "libpq-dev" -package "libgeos++-dev" -package "libproj-dev" -package "osmosis" - -python_package "osmium" + +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 + pyosmium +] source_directory = "#{basedir}/nominatim" build_directory = "#{basedir}/bin" @@ -177,7 +176,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") } + not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") } notifies :run, "execute[compile_nominatim]", :immediately end @@ -231,7 +230,7 @@ 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 @@ -240,19 +239,21 @@ 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" + 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 + 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 @@ -264,7 +265,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 @@ -324,19 +326,19 @@ apache_module "proxy_fcgi" apache_module "proxy_http" apache_module "headers" -service "php7.0-fpm" do +service "php7.2-fpm" do action [:enable, :start] supports :status => true, :restart => true, :reload => true end node[:nominatim][:fpm_pools].each do |name, data| - template "/etc/php/7.0/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) - notifies :reload, "service[php7.0-fpm]" + notifies :reload, "service[php7.2-fpm]" end end @@ -369,22 +371,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],