From e9c0351232f0e45f94cdda0dd615c1fb82616a7f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 11 Oct 2021 12:04:02 +0200
Subject: [PATCH] nominatim: remove some dead config options

---
 cookbooks/nominatim/README.md          |  6 ------
 cookbooks/nominatim/recipes/default.rb | 15 ---------------
 roles/nominatim.rb                     | 18 +-----------------
 roles/pummelzacken.rb                  |  6 ------
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/cookbooks/nominatim/README.md b/cookbooks/nominatim/README.md
index 190378ca2..8c5fa3780 100644
--- a/cookbooks/nominatim/README.md
+++ b/cookbooks/nominatim/README.md
@@ -1,9 +1,3 @@
 # Nominatim Cookbook
 
 This cookbook installs and configures the Nominatim geocoding service.
-
-It contains three recipes:
-* default: sets up a complete Nominatim installation including postgres backend
-           and apache frontend
-* master: defines additional attributes for running the server as DB master
-* slave: defines additional attributes for running the server as DB slave
diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 7e32db7e6..47d113acc 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -52,17 +52,6 @@ file "#{node[:nominatim][:logdir]}/update.log" do
   mode "664"
 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"
@@ -415,10 +404,6 @@ ssl_certificate node[:fqdn] do
   notifies :reload, "service[nginx]"
 end
 
-package "apache2" do
-  action :remove
-end
-
 include_recipe "nginx"
 
 nginx_site "default" do
diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 7665045a5..e9c6040c9 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -5,28 +5,12 @@ default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
-      :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [:lonvia, :tomh, :twain]
+        :members => [:lonvia, :tomh]
       }
     }
   },
-  :apache => {
-    :mpm => "event",
-    :timeout => 30,
-    :keepalive => false,
-    :reqtimeout => true,
-    :event => {
-      :server_limit => 100,
-      :max_request_workers => 2400,
-      :threads_per_child => 50,
-      :min_spare_threads => 125,
-      :max_spare_threads => 925,
-      :async_request_worker_factor => 4,
-      :listen_cores_buckets_ratio => 6
-    }
-  },
   :networking => {
     :firewall => {
       :http_rate_limit => "s:2/sec:15"
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ca7fae3d9..32fa6a823 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -38,12 +38,6 @@ default_attributes(
       }
     }
   },
-  :apache => {
-    :event => {
-      :max_request_workers => 3000,
-      :threads_per_child => 70
-    }
-  },
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],
-- 
2.45.1