Avoid duplicate resource definitions for apache_module[reqtimeout]

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 8e051057f8ccb88699c50a65caa81408103f8492..cff5e5b839c1b5fb0af59eed4b16e1d32b2feb73 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -29,3 +29,5 @@ default[:apache][:event][:max_connections_per_child] = 0
 default[:apache][:listen_address] = "*"
 
 default[:apache][:buffered_logs] = true
+
+default[:apache][:reqtimeout] = false

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 9b6c6ef5401bb2e8938b1202717b07a999b5b9ea..1a274e223b5e9605ea3fdca115a4a38884310029 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -67,8 +67,14 @@ apache_module "deflate" do
   conf "deflate.conf.erb"
 end
 
-apache_module "reqtimeout" do
-  action [:disable]
+if node[:apache][:reqtimeout]
+  apache_module "reqtimeout" do
+    action [:enable]
+  end
+else
+  apache_module "reqtimeout" do
+    action [:disable]
+  end
 end
 
 apache_module "ssl"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index e6d793afdf8314436a3fe797f2960b9e6ced931f..a4591d1eeb648abbbb8fcd49d77410df2e34feed 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -322,7 +322,6 @@ 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]

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 4a7d40e06fedc63e40d8f717ddd753a4821c6545..bcfb5434addcfbd5dc2f79d2e2322269030332b3 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -16,6 +16,7 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,
+    :reqtimeout => true,
     :event => {
       :server_limit => 32,
       :max_request_workers => 1600,