X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5dd8aa5513322ace530f7c242ed32918da6c86f1..3064ee8e6926e79a0cca6e5ea17e4db2150b7fe8:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index b10c92327..66eda9587 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,
@@ -135,7 +135,6 @@ end
 ## Nominatim backend
 
 include_recipe "git"
-include_recipe "python"
 
 package "build-essential"
 package "cmake"
@@ -143,7 +142,6 @@ 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"
@@ -151,9 +149,7 @@ package "libbz2-dev"
 package "libpq-dev"
 package "libgeos++-dev"
 package "libproj-dev"
-package "osmosis"
-
-python_package "osmium"
+package "pyosmium"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
@@ -231,7 +227,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 +236,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
@@ -252,7 +248,9 @@ template "/etc/cron.d/nominatim" do
   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 +262,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
@@ -369,22 +368,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 '^<HOST> - - \[\] "[^"]+" (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],