X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8faf607800930a4f6b5ae14742c8fbaf6a360eb4..1995a7f3e00ad96948e9cc56a265a1d2a0afc260:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 63fe2ca06..8d10a4b93 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
@@ -48,6 +50,17 @@ file "#{node[:nominatim][:logdir]}/update.log" do
   mode 0o664
 end
 
+# exception granted for a limited time so that they can set up their own server
+firewall_rule "increase-limits-gnome-proxy" do
+  action :accept
+  family "inet"
+  source "net:8.43.85.23"
+  dest "fw"
+  proto "tcp:syn"
+  dest_ports "https"
+  rate_limit "s:10/sec:30"
+end
+
 ## Postgresql
 
 include_recipe "postgresql"
@@ -152,6 +165,7 @@ package %w[
   libproj-dev
   python3-pyosmium
   pyosmium
+  python3-psycopg2
 ]
 
 source_directory = "#{basedir}/nominatim"
@@ -222,8 +236,7 @@ template "/etc/logrotate.d/nominatim" do
 end
 
 external_data = [
-  "wikipedia_article.sql.bin",
-  "wikipedia_redirect.sql.bin",
+  "wikimedia-importance.sql.gz",
   "gb_postcode_data.sql.gz"
 ]
 
@@ -340,6 +353,13 @@ node[:nominatim][:fpm_pools].each do |name, data|
   end
 end
 
+systemd_service "apache-nominatim" do
+  service "apache2"
+  dropin "nominatim"
+  tasks_max 12000
+  notifies :restart, "service[apache2]"
+end
+
 ssl_certificate "nominatim.openstreetmap.org" do
   domains ["nominatim.openstreetmap.org",
            "nominatim.osm.org",