Revert "nominatim: switch pyosmium from pip to packaged version"

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 14d70d9b3063ca6477dfe56f6268432842b69250..128bb34cf99b92d73e0ecd61173f7ab62a032397 100644 (file)
--- 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,
@@ -177,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
 
@@ -230,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
@@ -239,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
@@ -251,7 +252,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
@@ -263,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
@@ -274,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"
@@ -315,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]
@@ -368,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 '^<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],