diff --git a/attributes/default.rb b/attributes/default.rb index 4b2671d2fceb11a98f00615a6152b9e3ece0c6bc..c63723b4a92cb1708cd3788e358439965c8cb4ca 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 ead96b3f2a25a42e6e400bda30c934526dc8e38d..d5624f5870d6828c8ce88f77ce3dbefba9557334 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