Update MAC addresses for OOB on draco, grindtooth and sarel

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 9b6c6ef5401bb2e8938b1202717b07a999b5b9ea..bc0410fd3fb3bb4ef7e5d7e38ee35d44a1bd94a5 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,21 +19,27 @@
 
 include_recipe "ssl"
 
 
 include_recipe "ssl"
 

-package "apache2"
-package "libwww-perl"
+package %w[
+  apache2
+  libwww-perl
+]

 
 %w[event itk prefork worker].each do |mpm|
 
 %w[event itk prefork worker].each do |mpm|

-  if mpm == node[:apache][:mpm]
-    apache_module "mpm_#{mpm}" do
-      action [:enable]
-    end
-  else
-    apache_module "mpm_#{mpm}" do
-      action [:disable]
-    end
+  next if mpm == node[:apache][:mpm]
+
+  apache_module "mpm_#{mpm}" do
+    action [:disable]

   end
 end
 
   end
 end
 

+apache_module "mpm_#{node[:apache][:mpm]}" do
+  action [:enable]
+end
+
+if node[:lsb][:release].to_f >= 18.04
+  apache_module "http2"
+end
+

 admins = data_bag_item("apache", "admins")
 
 apache_conf "httpd" do
 admins = data_bag_item("apache", "admins")
 
 apache_conf "httpd" do


@@ -67,10 +73,17 @@ apache_module "deflate" do
   conf "deflate.conf.erb"
 end
 
   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
 
 end
 

+apache_module "headers"

 apache_module "ssl"
 
 apache_conf "ssl" do
 apache_module "ssl"
 
 apache_conf "ssl" do