Download as
Browse Code »

Commit bcad51dd69da3f6bfa3693b833c87c473015ba6e

Authored by Rodrigo Souto
1 parent 5e1b57aa
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Changing path to solr config

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
  Diff comments   View file @bcad51d
@@ -31,7 +31,7 @@ unless defined? SOLR_PID_FILE @@ -31,7 +31,7 @@ unless defined? SOLR_PID_FILE
31 end 31 end
32 32
33 unless defined? SOLR_PORT 33 unless defined? SOLR_PORT
34 - config = YAML::load_file(RAILS_ROOT+'/config/solr.yml') 34 + config = YAML::load_file(RAILS_ROOT+'/plugins/solr/config/solr.yml')
35 raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']] 35 raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]
36 36
37 SOLR_HOST = ENV['HOST'] || URI.parse(config[ENV['RAILS_ENV']]['url']).host 37 SOLR_HOST = ENV['HOST'] || URI.parse(config[ENV['RAILS_ENV']]['url']).host
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb
  Diff comments   View file @bcad51d
@@ -4,7 +4,7 @@ module ActsAsSolr @@ -4,7 +4,7 @@ module ActsAsSolr
4 def config 4 def config
5 return @config if @config 5 return @config if @config
6 @config = {} 6 @config = {}
7 - YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v } 7 + YAML::load_file("#{Rails.root}/plugins/solr/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v }
8 @config 8 @config
9 end 9 end
10 10