From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Jul 2017 23:15:03 +0000 (+0100)
Subject: Avoid duplicate resource definitions for apache_module[reqtimeout]
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/96ec481d8fc8db85b44daee8d87889d8fce909d4?ds=sidebyside

Avoid duplicate resource definitions for apache_module[reqtimeout]
---

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 8e051057f..cff5e5b83 100644
--- 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 9b6c6ef54..1a274e223 100644
--- 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 e6d793afd..a4591d1ee 100644
--- 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 4a7d40e06..bcfb5434a 100644
--- 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,