Disable virtual host support for squid 3 caches

[chef.git] / cookbooks / apache / recipes / default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index a24ea18f2f441844444d63794c2cdb921983e45f..bbd15a9d3425bb6ce506831b4c9c9002dc5a982b 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,14 @@
 # limitations under the License.
 #
 
-package "apache2"
-package "libwww-perl"
+include_recipe "ssl"
 
-%w(event itk prefork worker).each do |mpm|
+package %w[
+  apache2
+  libwww-perl
+]
+
+%w[event itk prefork worker].each do |mpm|
   if mpm == node[:apache][:mpm]
     apache_module "mpm_#{mpm}" do
       action [:enable]
@@ -65,8 +69,21 @@ 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 "headers"
+apache_module "ssl"
+
+apache_conf "ssl" do
+  template "ssl.erb"
 end
 
 munin_plugin "apache_accesses"