diff --git a/etc/init.d/noosfero b/etc/init.d/noosfero
index 9abc2d7..0f8f5eb 100755
--- a/etc/init.d/noosfero
+++ b/etc/init.d/noosfero
@@ -48,9 +48,9 @@ SOLR_PID_FILE=$NOOSFERO_DIR/tmp/pids/solr.production.pid
 main_script() {
   cd $NOOSFERO_DIR
   if [ "$NOOSFERO_USER" != "$USER" ]; then
-    su $NOOSFERO_USER -l -c "./script/production $1"
+    su $NOOSFERO_USER -l -c "SOLR_DATA_PATH=/var/lib/noosfero/solr ./script/production $1"
   else
-    ./script/production $1
+    SOLR_DATA_PATH=/var/lib/noosfero/solr ./script/production $1
   fi
 }
 
@@ -76,6 +76,13 @@ do_setup() {
     chmod 750 /var/tmp/noosfero
   fi
 
+  # Solr directory
+  if [ ! -d /var/tmp/noosfero/solr ]; then
+    mkdir -p /var/tmp/noosfero/solr
+    chown $NOOSFERO_USER:root /var/tmp/noosfero/solr
+    chmod 750 /var/tmp/noosfero/solr
+  fi
+
   # symlink the directories into Noosfero directory
   if [ ! -e $NOOSFERO_DIR/tmp ]; then
     ln -s /var/tmp/noosfero $NOOSFERO_DIR/tmp
diff --git a/vendor/plugins/acts_as_solr/config/solr_environment.rb b/vendor/plugins/acts_as_solr/config/solr_environment.rb
index 88619bc..daa56df 100644
--- a/vendor/plugins/acts_as_solr/config/solr_environment.rb
+++ b/vendor/plugins/acts_as_solr/config/solr_environment.rb
@@ -6,7 +6,7 @@ SOLR_PATH = "#{File.dirname(File.expand_path(__FILE__))}/../solr" unless defined
 SOLR_LOGS_PATH = "#{rails_root_dir}/log" unless defined? SOLR_LOGS_PATH
 SOLR_PIDS_PATH = "#{rails_root_dir}/tmp/pids" unless defined? SOLR_PIDS_PATH
 SOLR_PID_FILE="#{SOLR_PIDS_PATH}/solr.#{ENV['RAILS_ENV']}.pid"
-SOLR_DATA_PATH = "#{rails_root_dir}/solr/#{ENV['RAILS_ENV']}" unless defined? SOLR_DATA_PATH
+SOLR_DATA_PATH = ENV['SOLR_DATA_PATH'] || "#{rails_root_dir}/solr/#{ENV['RAILS_ENV']}" unless defined? SOLR_DATA_PATH
 
 unless defined? SOLR_PORT
   config = YAML::load_file(rails_root_dir+'/config/solr.yml')
--
libgit2 0.21.2