X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..f2c65737901325f23db479f250b502c3525172f3:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index bbd15a9d3..bc0410fd3 100644
--- 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|
-  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
 
+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