From 01120b9774191ce79a5cf3f7b3841b1f960eb0c0 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 9 May 2013 19:18:32 -0300 Subject: [PATCH] Changing path to solr config --- plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb | 2 +- plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7c69d11..910b4c9 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 @@ -31,7 +31,7 @@ unless defined? SOLR_PID_FILE end unless defined? SOLR_PORT - config = YAML::load_file(RAILS_ROOT+'/config/solr.yml') + 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 diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb index bd8250f..fca8f4f 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb @@ -4,7 +4,7 @@ module ActsAsSolr def config return @config if @config @config = {} - YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v } + YAML::load_file("#{Rails.root}/plugins/solr/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v } @config end -- libgit2 0.21.2