From 2fbf3b45aa348cf2081e21843a7f24478838f34d Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Wed, 3 Aug 2016 01:49:39 +0200
Subject: [PATCH] [FEATURE] Xenial compatibility
---
attributes/default.rb | 24 ++++++++++++++++++++++++
metadata.rb | 2 +-
providers/app.rb | 6 +++---
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/attributes/default.rb b/attributes/default.rb
index 916bd20..dc14841 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1 +1,25 @@
+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['tomcat']['base_instance'] = "tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['packages'] = ["tomcat#{node['tomcat']['base_version']}"]
+default['tomcat']['deploy_manager_packages'] = ["tomcat#{node['tomcat']['base_version']}-admin"]
+default['tomcat']['user'] = "tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['group'] = "tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['home'] = "/usr/share/tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['base'] = "/var/lib/tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['config_dir'] = "/etc/tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['log_dir'] = "/var/log/tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['tmp_dir'] = "/tmp/tomcat#{node['tomcat']['base_version']}-tmp"
+default['tomcat']['work_dir'] = "/var/cache/tomcat#{node['tomcat']['base_version']}"
+default['tomcat']['context_dir'] = "#{node['tomcat']['config_dir']}/Catalina/localhost"
+default['tomcat']['webapp_dir'] = "/var/lib/tomcat#{node['tomcat']['base_version']}/webapps"
+
default['typo3_solr']['solr']['solr_home'] = '/srv/solr'
\ No newline at end of file
diff --git a/metadata.rb b/metadata.rb
index bb36a7b..b064341 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -10,4 +10,4 @@ issues_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_solr/issues'
source_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_solr'
depends 'apt'
-depends 'tomcat', '~> 2.3.1'
\ No newline at end of file
+depends 'tomcat', '~> 1.3.0'
\ No newline at end of file
diff --git a/providers/app.rb b/providers/app.rb
index 9090813..0a42920 100644
--- a/providers/app.rb
+++ b/providers/app.rb
@@ -20,7 +20,7 @@ action :add do
plugin_uri = "https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-#{new_resource.plugin}"
service 'tomcat' do
- service_name 'tomcat6'
+ service_name node['tomcat']['base_instance']
supports :restart => true, :reload => true, :status => true
end
@@ -40,7 +40,7 @@ action :add do
end
execute "decompress-solr-archive - #{new_resource.name}" do
- cwd #{Chef::Config['file_cache_path']}
+ cwd Chef::Config['file_cache_path']
command "tar -xzf apache-solr-#{new_resource.solr}.tar.gz"
creates "#{Chef::Config['file_cache_path']}/apache-solr-#{new_resource.solr}/dist/apache-solr-#{new_resource.solr}.war"
end
@@ -232,7 +232,7 @@ end
action :remove do
service 'tomcat' do
- service_name 'tomcat6'
+ service_name node['tomcat']['base_instance']
supports :restart => true, :reload => true, :status => true
end
--
GitLab