diff --git a/etc/init.d/noosfero b/etc/init.d/noosfero
index d09633a..6881286 100755
--- a/etc/init.d/noosfero
+++ b/etc/init.d/noosfero
@@ -45,14 +45,13 @@ if [ -z "$NOOSFERO_DIR" ] || [ -z "$NOOSFERO_USER" ]; then
 fi
 
 ######################
-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 "SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1"
+    su $NOOSFERO_USER -l -c "./script/production $1"
   else
-    SOLR_DATA_PATH=/var/lib/noosfero-data/index ./script/production $1
+    ./script/production $1
   fi
 }
 
@@ -78,13 +77,6 @@ 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
@@ -98,28 +90,21 @@ do_setup() {
 }
 
 do_start() {
-
-  # FIXME should not test for solr only
-  if [ -e $SOLR_PID_FILE ]; then
-    echo 'noosfero already running, cannot start.'
-    exit 2
+  if ! running; then
+    do_setup
+    # actually start the service
+    main_script start
+  else
+    echo 'Noosfero is already running, nothing to do...'
   fi
-
-  do_setup
-
-  # actually start the service
-  main_script start
 }
 
 do_stop() {
-
-  # FIXME should not test for solr only
-  if [ ! -e $SOLR_PID_FILE ]; then
-    echo 'noosfero not running, cannot stop'
-    exit 2
+  if running; then
+    main_script stop
+  else
+    echo 'Noosfero is already stopped, nothing to do...'
   fi
-
-  main_script stop
 }
 
 do_restart() {
@@ -127,6 +112,10 @@ do_restart() {
   do_start
 }
 
+running(){
+  pgrep -u noosfero -f server > /dev/null
+}
+
 case "$1" in
   start|stop|restart|setup)
     do_$1
--
libgit2 0.21.2