Enable HTTP/2 over TLS on 18.04

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 989755f67a4e04f333cc542c6b91ee1a08b24dd8..bc0410fd3fb3bb4ef7e5d7e38ee35d44a1bd94a5 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -36,6 +36,10 @@ apache_module "mpm_#{node[:apache][:mpm]}" do
   action [:enable]
 end
 
   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

diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb
index add175aa29e54df20ce612d426ee50fa22c6e73a..ded019d938923030895ba2794244eb62c743ad0f 100644 (file)
--- a/cookbooks/apache/templates/default/httpd.conf.erb
+++ b/cookbooks/apache/templates/default/httpd.conf.erb
@@ -1,5 +1,10 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

+<% if node[:lsb][:release].to_f >= 18.04 -%>
+# Enable HTTP/2 over TLS
+Protocols h2 http/1.1
+
+<% end -%>

 # Set the number of seconds before receives and sends time out
 Timeout <%= node[:apache][:timeout] %>
 
 # Set the number of seconds before receives and sends time out
 Timeout <%= node[:apache][:timeout] %>