From db946e376a814cd587daf15966b74ee9b6353a94 Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Tue, 3 Oct 2017 16:01:48 +0200
Subject: [PATCH] [TASK] Update for the new solr major version, update the solr
updateConnections call
---
attributes/default.rb | 8 +++-----
recipes/default.rb | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/attributes/default.rb b/attributes/default.rb
index e75cfe6..795ce95 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -17,12 +17,10 @@ else
default['typo3_site']['mysql_version'] = '5.6'
end
+# Default Solr Configuration
default['typo3_site']['solr']['init'] = false
-default['typo3_site']['solr']['version_solr'] = '4.10.4' # latest supported solr version of the TYPO3 extension
-default['typo3_site']['solr']['version_extension'] = '3.1' # branch of the TYPO3 extension
-default['typo3_site']['solr']['version_plugin_access'] = '2.1' # access plugin of the TYPO3 extension
-default['typo3_site']['solr']['version_plugin_utils'] = '1.2' # access plugin of the TYPO3 extension
-default['typo3_site']['solr']['version_plugin_lang'] = '3.3.2' # access plugin of the TYPO3 extension
+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']['languages'] = %w{ german english } # available languages for the cores
default['typo3_site']['solr']['cores'] = [
{
diff --git a/recipes/default.rb b/recipes/default.rb
index d4e19e5..60c292d 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -577,7 +577,7 @@ if node['typo3_site']['solr']['init']
end
execute 'solr-updateConnections' do
- command "php #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{node['typo3_site']['web_directory']}/typo3/cli_dispatch.phpsh solr updateConnections || true"
+ command "php #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{node['typo3_site']['web_directory']}/typo3/cli_dispatch.phpsh extbase solr:updateconnections || true"
user 'vagrant'
group data_bag['groupId']
action :run
--
GitLab