From 28a971aaa37c09f1fc477e5a5b5a3b5235835186 Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Wed, 3 Aug 2016 00:29:56 +0200
Subject: [PATCH] [FEATURE] Add HTTP/2 support for xenial
---
attributes/default.rb | 1 -
recipes/default.rb | 18 +++++++++++++++++-
templates/default/vHost.conf.erb | 3 +++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/attributes/default.rb b/attributes/default.rb
index 6c9e4d6..8bc4612 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -13,7 +13,6 @@ default['typo3_site']['repository_hostname'] = ''
default['typo3_site']['repository_port'] = 22
default['typo3_site']['download_typo3'] = false
default['typo3_site']['typo3_version'] = '7.6'
-default['typo3_site']['deploy_dump'] = '~/site/dump.sql'
if node['platform_version'] == '16.04'
default['typo3_site']['mysql_version'] = '5.7'
diff --git a/recipes/default.rb b/recipes/default.rb
index a3129ad..19d5f28 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -42,6 +42,22 @@ end
### Install additional packages ###
###################################
+if node['platform_version'] == '16.04'
+ apt_repository('apache2') do
+ uri 'http://ppa.launchpad.net/ondrej/apache2/ubuntu'
+ deb_src true
+ trusted true
+ keyserver 'keyserver.ubuntu.com'
+ key 'E5267A6C'
+ distribution 'xenial'
+ components [:main]
+ arch 'amd64'
+ action :add
+ end
+
+ execute 'apt-get -y update'
+end
+
include_recipe 'graphicsmagick'
include_recipe 'apache2'
include_recipe 'apache2::mod_ssl'
@@ -62,7 +78,7 @@ else
end
end
-%w{expires headers ssl deflate rewrite}.each do |name|
+%w{expires headers ssl deflate rewrite http2}.each do |name|
apache_module name do
enable true
end
diff --git a/templates/default/vHost.conf.erb b/templates/default/vHost.conf.erb
index abcbfa7..bd094d2 100644
--- a/templates/default/vHost.conf.erb
+++ b/templates/default/vHost.conf.erb
@@ -3,6 +3,9 @@
ServerName <%= @params[:server_name] %>
ServerAlias <%= @params[:server_aliases] %>
+ # Enable HTTP/2
+ Protocols h2 http/1.1
+
DocumentRoot <%= @params[:docroot] %>
<Directory <%= @params[:docroot] %>>
Options FollowSymLinks MultiViews
--
GitLab