From c79797b78a5a7484817cc01675ea85442d4a44b4 Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Wed, 3 Aug 2016 01:53:17 +0200
Subject: [PATCH] [TASK] Move java/tomcat stuff to the typo3_solr cookbook

---
 attributes/default.rb | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 6738fe0..d4cc462 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,13 +1,3 @@
-if node['platform_version'] == '16.04'
-	default['tomcat']['base_version'] = 8
-	default['java']['jdk_version'] = 8
-else
-	default['tomcat']['base_version'] = 6
-	default['java']['jdk_version'] = 7
-	default['java']['install_flavor'] = 'oracle'
-	default['java']['oracle']['accept_oracle_download_terms'] = true
-end
-
 default['typo3_site']['ip_address'] = ''
 default['typo3_site']['webroot'] = '/var/www'
 default['typo3_site']['site_configuration'] = 'SiteConfiguration.php'
-- 
GitLab