Download as
Browse Code »

Commit 01120b9774191ce79a5cf3f7b3841b1f960eb0c0

Authored by Rodrigo Souto
1 parent 22745db9
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 @01120b9
... ... @@ -31,7 +31,7 @@ unless defined? SOLR_PID_FILE
31 31 end
32 32  
33 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 35 raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]
36 36  
37 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 @01120b9
... ... @@ -4,7 +4,7 @@ module ActsAsSolr
4 4 def config
5 5 return @config if @config
6 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 8 @config
9 9 end
10 10  
... ...