Run i18n:js:export rake task on web site updates

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index bbd15a9d3425bb6ce506831b4c9c9002dc5a982b..bc0410fd3fb3bb4ef7e5d7e38ee35d44a1bd94a5 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -25,17 +25,21 @@ package %w[
 ]
 
 %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