From e5eaef1bb0358e19c7c88727b0af3eb56778a0fd Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Tue, 3 Oct 2017 17:57:49 +0200
Subject: [PATCH] [TASK] Adjustments for the new solr cookbook main release
---
attributes/default.rb | 2 +-
recipes/default.rb | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/attributes/default.rb b/attributes/default.rb
index 4b2671d..c63723b 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -22,7 +22,7 @@ default['typo3_site']['solr']['init'] = false
default['typo3_site']['solr']['version_solr'] = '6.6.1' # latest supported solr version of the TYPO3 extension
default['typo3_site']['solr']['version_extension'] = '7.0' # branch of the TYPO3 extension
default['typo3_site']['solr']['version_tika_server'] = '1.16' # branch of the TYPO3 extension
-default['typo3_site']['solr']['languages'] = %w{ german english } # available languages for the cores
+default['typo3_site']['solr']['config_directory'] = 'ext_solr_7_0_0' # configuration directory in server/solr/configsets/
default['typo3_site']['solr']['cores'] = [
{
:name => 'core-en_US',
diff --git a/recipes/default.rb b/recipes/default.rb
index ead96b3..d5624f5 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -562,13 +562,12 @@ if node['typo3_site']['solr']['init']
solr node['typo3_site']['solr']['version_solr']
extension node['typo3_site']['solr']['version_extension']
tika_server node['typo3_site']['solr']['version_tika_server']
- languages node['typo3_site']['solr']['languages']
end
node['typo3_site']['solr']['cores'].each do |core_data|
typo3_solr_core core_data['name'] do
language core_data['language']
- app 'solr'
+ config_directory node['typo3_site']['solr']['config_directory']
action :add
end
end
--
GitLab