[FEATURE] Provide PHP 7.1 by default

attributes/default.rb

@@ -13,8 +13,10 @@ default['typo3_site']['typo3_version'] = '7.6'
 
 if node['platform_version'] == '16.04'
 	default['typo3_site']['mysql_version'] = '5.7'
+	default['typo3_site']['php_version'] = '7.1' # either 7.0 or 7.1
 else
 	default['typo3_site']['mysql_version'] = '5.6'
+	default['typo3_site']['php_version'] = '-' # option is not available for older platforms
 end
 
 default['typo3_site']['solr']['init'] = false

recipes/default.rb

@@ -55,6 +55,18 @@ if node['platform_version'] == '16.04'
 		action :add
 	end
 
+	apt_repository('php7.1') do
+		uri 'http://ppa.launchpad.net/ondrej/php/ubuntu'
+		deb_src true
+		trusted true
+		keyserver 'keyserver.ubuntu.com'
+		key 'E5267A6C'
+		distribution 'xenial'
+		components [:main]
+		arch 'amd64'
+		action :add
+	end
+
 	execute 'apt -y update'
 end
 
@@ -63,7 +75,7 @@ include_recipe 'apache2'
 include_recipe 'apache2::mod_ssl'
 
 if node['platform_version'] == '16.04'
-	package 'libapache2-mod-php7.0'
+	package 'libapache2-mod-php' + node['typo3_site']['php_version']
 	%w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql php-xml php-json php-mbstring php-soap php-zip php-imagick).each do |name|
 		package name do
 			action :install
@@ -94,67 +106,67 @@ end
 
 if node['platform_version'] == '16.04'
 	replace_or_add 'Increase time limit' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern 'max_execution_time =.*'
 		line 'max_execution_time = 240'
 	end
 
 	replace_or_add 'Increase time limit - CLI' do
-		path '/etc/php/7.0/cli/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/cli/php.ini'
 		pattern 'max_execution_time =.*'
 		line 'max_execution_time = 240'
 	end
 
 	replace_or_add 'Increase memory limit' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern 'memory_limit =.*'
 		line 'memory_limit = 256M'
 	end
 
 	replace_or_add 'Increase upload size limit' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern 'upload_max_filesize =.*'
 		line 'upload_max_filesize = 10M'
 	end
 
 	replace_or_add 'Increase upload size limit - CLI' do
-		path '/etc/php/7.0/cli/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/cli/php.ini'
 		pattern 'upload_max_filesize =.*'
 		line 'upload_max_filesize = 10M'
 	end
 
 	replace_or_add 'Increase post_max_size limit' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern 'post_max_size =.*'
 		line 'post_max_size = 10M'
 	end
 
 	replace_or_add 'Increase post_max_size limit - CLI' do
-		path '/etc/php/7.0/cli/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/cli/php.ini'
 		pattern 'post_max_size =.*'
 		line 'post_max_size = 10M'
 	end
 
 	replace_or_add 'Set date.timezone' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern 'date.timezone =.*'
 		line 'date.timezone = Europe/Berlin'
 	end
 
 	replace_or_add 'Set date.timezone - CLI' do
-		path '/etc/php/7.0/cli/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/cli/php.ini'
 		pattern 'date.timezone =.*'
 		line 'date.timezone = Europe/Berlin'
 	end
 
 	replace_or_add 'Set max_input_vars' do
-		path '/etc/php/7.0/apache2/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/apache2/php.ini'
 		pattern '.*max_input_vars =.*'
 		line 'max_input_vars = 1500'
 	end
 
 	replace_or_add 'Set max_input_vars - CLI' do
-		path '/etc/php/7.0/cli/php.ini'
+		path '/etc/php/' + node['typo3_site']['php_version'] + '/cli/php.ini'
 		pattern '.*max_input_vars =.*'
 		line 'max_input_vars = 1500'
 	end