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 de01551650c312eb49b818ca93f55b4615de1e54..66eda9587feff5707ebdc5d42eb5e15c9ff23d00 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -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"
@@ -372,17 +368,6 @@ end
 
 include_recipe "fail2ban"
 
-fail2ban_filter "nominatim" do
-  failregex "Warning ignored: <HOST>"
-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],