[FEATURE] Allow the installation of Solr

Berksfile

+source 'https://supermarket.chef.io'
+
+metadata
+
+cookbook 'typo3_solr', git: "https://github.com/opendo/chef-typo3_solr.git"

attributes/default.rb

+default['tomcat']['base_version'] = 8
+default['java']['jdk_version'] = 7
+
 default['typo3_site']['ip_address'] = ''
 default['typo3_site']['webroot'] = '/var/www'
 default['typo3_site']['site_configuration'] = 'SiteConfiguration.php'
@@ -10,6 +13,24 @@ default['typo3_site']['download_typo3'] = false
 default['typo3_site']['typo3_version'] = '6.2'
 default['typo3_site']['deploy_dump'] = '~/site/dump.sql'
 
+default['typo3_site']['solr']['init'] = false
+default['typo3_site']['solr']['version_solr'] = '4.8.1' # latest support solr version of the TYPO3 extension
+default['typo3_site']['solr']['version_extension'] = '3.0' # 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']['languages'] = %w{ german english } # available languages for the cores
+default['typo3_site']['solr']['cores'] = [
+	{
+		:name => 'core-en_US',
+		:language => 'english'
+	},
+	{
+		:name => 'core-de_DE',
+		:language => 'german'
+	},
+]
+
 # Example:
 #[
 #	{

metadata.rb

@@ -11,6 +11,9 @@ depends 'apache2', '~> 3.0.0'
 depends 'database', '~> 4.0.0'
 depends 'graphicsmagick'
 depends 'hostsfile'
+depends 'java'
+depends 'line'
 depends 'mysql', '~> 6.0.0'
 depends 'mysql2_chef_gem', '~> 1.0.0'
-depends 'line'
\ No newline at end of file
+depends 'tomcat', '~> 0.17'
+depends 'typo3_solr', '~> 1.2.0'

recipes/default.rb

@@ -120,41 +120,40 @@ end
 ### Setup TYPO3 ###
 ###################
 
-if node['typo3_site']['download_typo3']
-	bash 'Setup TYPO3' do
-		cwd '/home/vagrant/'
-		user 'vagrant'
-		group 'vagrant'
-		timeout 3000000
-
-		code <<-EOF
-			if [ ! -d #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']} ]
-			then
-				wget http://get.typo3.org/#{node['typo3_site']['typo3_version']} \
-					-O typo3_src-#{node['typo3_site']['typo3_version']}.tgz
-
-				mkdir -p #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']}
-				tar -xzf typo3_src-#{node['typo3_site']['typo3_version']}.tgz --strip-components=1 \
-					-C #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']};
-			fi
-
-			cd #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}
-			rm -f typo3_src
-			ln -s ../typo3_src-#{node['typo3_site']['typo3_version']} typo3_src
-			touch typo3conf/ENABLE_INSTALL_TOOL
-
-			if [ ! -f typo3 ]
-			then
-				ln -s typo3_src/typo3 typo3
-			fi
-
-			if [ ! -f index.php ]
-			then
-				ln -s typo3_src/index.php index.php
-			fi
-		EOF
-		action :run
-	end
+bash 'Setup TYPO3' do
+	cwd '/home/vagrant/'
+	user 'vagrant'
+	group 'vagrant'
+	timeout 3000000
+	only_if { node['typo3_site']['download_typo3'] }
+
+	code <<-EOF
+		if [ ! -d #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']} ]
+		then
+			wget http://get.typo3.org/#{node['typo3_site']['typo3_version']} \
+				-O typo3_src-#{node['typo3_site']['typo3_version']}.tgz
+
+			mkdir -p #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']}
+			tar -xzf typo3_src-#{node['typo3_site']['typo3_version']}.tgz --strip-components=1 \
+				-C #{node['typo3_site']['webroot']}/typo3_src-#{node['typo3_site']['typo3_version']};
+		fi
+
+		cd #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}
+		rm -f typo3_src
+		ln -s ../typo3_src-#{node['typo3_site']['typo3_version']} typo3_src
+		touch typo3conf/ENABLE_INSTALL_TOOL
+
+		if [ ! -f typo3 ]
+		then
+			ln -s typo3_src/typo3 typo3
+		fi
+
+		if [ ! -f index.php ]
+		then
+			ln -s typo3_src/index.php index.php
+		fi
+	EOF
+	action :run
 end
 
 #######################
@@ -317,3 +316,36 @@ node['typo3_site']['sync_databases'].each do |database_data|
 		end
 	end
 end
+
+##################
+### Setup Solr ###
+##################
+
+if node['typo3_site']['solr']['init']
+	include_recipe 'java'
+	include_recipe 'typo3_solr'
+
+	typo3_solr_app 'solr' do
+		solr node['typo3_site']['solr']['version_solr']
+		extension node['typo3_site']['solr']['version_extension']
+		plugin_access node['typo3_site']['solr']['version_plugin_access']
+		plugin_utils node['typo3_site']['solr']['version_plugin_utils']
+		plugin_lang node['typo3_site']['solr']['version_plugin_lang']
+		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'
+			action :add
+		end
+	end
+
+	execute 'solr-updateConnections' do
+		command "php #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3/cli_dispatch.phpsh solr updateConnections || true"
+		user 'vagrant'
+		group 'vagrant'
+		action :run
+	end
+end
\ No newline at end of file