X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9be289f6ca62466cd80a1ee4cf8a7c819b3831b8..51cef88ffafde1cbe77daf204aa347bdc470540f:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index d667db3cf..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, @@ -231,7 +231,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,7 +240,7 @@ 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 @@ -372,17 +372,6 @@ end include_recipe "fail2ban" -fail2ban_filter "nominatim" do - failregex "Warning ignored: " -end - -fail2ban_jail "nominatim" do - filter "nominatim" - logpath "#{node[:nominatim][:logdir]}/restricted_ips.log" - ports [80, 443] - maxretry 3 -end - munin_plugin_conf "nominatim" do template "munin.erb" variables :db => node[:nominatim][:dbname],