From 44220b5f274f6482c646489c9f18c9fb8b6ae0fc Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 29 May 2013 14:46:06 -0300 Subject: [PATCH] Extending solr config to accept data_path --- plugins/solr/config/solr.yml | 25 ------------------------- plugins/solr/config/solr.yml.dist | 1 + plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb | 4 ++-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 plugins/solr/config/solr.yml diff --git a/plugins/solr/config/solr.yml b/plugins/solr/config/solr.yml deleted file mode 100644 index 940bec9..0000000 --- a/plugins/solr/config/solr.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Config file for the acts_as_solr plugin. -# -# If you change the host or port number here, make sure you update -# them in your Solr config file - -# No change is needed to support multitenancy. Only one solr environment will be used. -# Just remember to use 'rake multitenancy:reindex' for reindexation. - -production: - url: http://127.0.0.1:8983/solr - jvm_options: -server -Xmx192M -Xms64M - timeout: 0 - -development: - url: http://0.0.0.0:8982/solr - jvm_options: -server -Xmx128M -Xms16M - timeout: 0 - -test: &TEST - url: http://0.0.0.0:8981/solr - jvm_options: -server -Xmx128M -Xms16M - timeout: 0 - -cucumber: - <<: *TEST diff --git a/plugins/solr/config/solr.yml.dist b/plugins/solr/config/solr.yml.dist index 940bec9..a24a59f 100644 --- a/plugins/solr/config/solr.yml.dist +++ b/plugins/solr/config/solr.yml.dist @@ -10,6 +10,7 @@ production: url: http://127.0.0.1:8983/solr jvm_options: -server -Xmx192M -Xms64M timeout: 0 + data_path: /var/lib/noosfero-data/solr/index development: url: http://0.0.0.0:8982/solr diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb index 910b4c9..20b98ea 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb @@ -6,6 +6,7 @@ require 'net/http' dir = File.dirname(__FILE__) SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH +config = YAML::load_file(RAILS_ROOT+'/plugins/solr/config/solr.yml') unless defined? RAILS_ROOT # define RAILS_ROOT for test environment @@ -21,7 +22,7 @@ unless defined? SOLR_PIDS_PATH SOLR_PIDS_PATH = ENV["SOLR_PIDS_PATH"] || "#{RAILS_ROOT}/tmp/pids" end unless defined? SOLR_DATA_PATH - SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || "#{RAILS_ROOT}/solr/#{ENV['RAILS_ENV']}" + SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || config[ENV['RAILS_ENV']]['data_path'] || "#{RAILS_ROOT}/solr/#{ENV['RAILS_ENV']}" end unless defined? SOLR_CONFIG_PATH SOLR_CONFIG_PATH = ENV["SOLR_CONFIG_PATH"] || "#{SOLR_PATH}/solr" @@ -31,7 +32,6 @@ unless defined? SOLR_PID_FILE end unless defined? SOLR_PORT - config = YAML::load_file(RAILS_ROOT+'/plugins/solr/config/solr.yml') raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']] SOLR_HOST = ENV['HOST'] || URI.parse(config[ENV['RAILS_ENV']]['url']).host -- libgit2 0.21.2