From 6e87dfce296355aee2a1f2998ee31520e58de12c Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Tue, 2 Aug 2016 21:28:10 +0200
Subject: [PATCH] [BUGFIX] Fix foodcritic
---
attributes/default.rb | 3 +--
recipes/default.rb | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/attributes/default.rb b/attributes/default.rb
index 4d0d8f5..6c9e4d6 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -15,8 +15,7 @@ default['typo3_site']['download_typo3'] = false
default['typo3_site']['typo3_version'] = '7.6'
default['typo3_site']['deploy_dump'] = '~/site/dump.sql'
-version = String(`awk '/DISTRIB_RELEASE=/' /etc/lsb-release | sed 's/DISTRIB_RELEASE=//' | sed 's/[.]/./' | tr -d '\n'`)
-if version == '16.04'
+if node['platform_version'] == '16.04'
default['typo3_site']['mysql_version'] = '5.7'
else
default['typo3_site']['mysql_version'] = '5.6'
diff --git a/recipes/default.rb b/recipes/default.rb
index 629c5e4..cdbb447 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -23,7 +23,6 @@
# THE SOFTWARE.
data_bag = data_bag_item('apps', 'global')
-version = String(`awk '/DISTRIB_RELEASE=/' /etc/lsb-release | sed 's/DISTRIB_RELEASE=//' | sed 's/[.]/./' | tr -d '\n'`)
##########################
### Add hostname entry ###
@@ -47,7 +46,7 @@ include_recipe 'graphicsmagick'
include_recipe 'apache2'
include_recipe 'apache2::mod_ssl'
-if version == '16.04'
+if node['platform_version'] == '16.04'
include_recipe 'apache2::mod_fcgid'
%w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql ).each do |name|
package name do
@@ -67,7 +66,7 @@ end
### Modify PHP Configuration ###
################################
-if version == '16.04'
+if node['platform_version'] == '16.04'
replace_or_add 'Increase time limit' do
path '/etc/php/7.0/fpm/php.ini'
pattern 'max_execution_time =.*'
--
GitLab