Download as
Browse Code »

Commit 602c589482532940539d4f5ef211f7ba7bc1ce44

Authored by Braulio Bhavamitra
1 parent 4cf77025
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Set Solr index data path

Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
etc/init.d/noosfero
  Diff comments   View file @602c589
... ... @@ -48,9 +48,9 @@ SOLR_PID_FILE=$NOOSFERO_DIR/tmp/pids/solr.production.pid
48 48 main_script() {
49 49 cd $NOOSFERO_DIR
50 50 if [ "$NOOSFERO_USER" != "$USER" ]; then
51   - su $NOOSFERO_USER -l -c "./script/production $1"
  51 + su $NOOSFERO_USER -l -c "SOLR_DATA_PATH=/var/lib/noosfero/solr ./script/production $1"
52 52 else
53   - ./script/production $1
  53 + SOLR_DATA_PATH=/var/lib/noosfero/solr ./script/production $1
54 54 fi
55 55 }
56 56  
... ... @@ -76,6 +76,13 @@ do_setup() {
76 76 chmod 750 /var/tmp/noosfero
77 77 fi
78 78  
  79 + # Solr directory
  80 + if [ ! -d /var/tmp/noosfero/solr ]; then
  81 + mkdir -p /var/tmp/noosfero/solr
  82 + chown $NOOSFERO_USER:root /var/tmp/noosfero/solr
  83 + chmod 750 /var/tmp/noosfero/solr
  84 + fi
  85 +
79 86 # symlink the directories into Noosfero directory
80 87 if [ ! -e $NOOSFERO_DIR/tmp ]; then
81 88 ln -s /var/tmp/noosfero $NOOSFERO_DIR/tmp
... ...
vendor/plugins/acts_as_solr/config/solr_environment.rb
  Diff comments   View file @602c589
... ... @@ -6,7 +6,7 @@ SOLR_PATH = "#{File.dirname(File.expand_path(__FILE__))}/../solr" unless defined
6 6 SOLR_LOGS_PATH = "#{rails_root_dir}/log" unless defined? SOLR_LOGS_PATH
7 7 SOLR_PIDS_PATH = "#{rails_root_dir}/tmp/pids" unless defined? SOLR_PIDS_PATH
8 8 SOLR_PID_FILE="#{SOLR_PIDS_PATH}/solr.#{ENV['RAILS_ENV']}.pid"
9   -SOLR_DATA_PATH = "#{rails_root_dir}/solr/#{ENV['RAILS_ENV']}" unless defined? SOLR_DATA_PATH
  9 +SOLR_DATA_PATH = ENV['SOLR_DATA_PATH'] || "#{rails_root_dir}/solr/#{ENV['RAILS_ENV']}" unless defined? SOLR_DATA_PATH
10 10  
11 11 unless defined? SOLR_PORT
12 12 config = YAML::load_file(rails_root_dir+'/config/solr.yml')
... ...