Merge branch 'mat-master' of ssh://delanoe.org:1979/gargantext into mat-master

init/README.rst

@@ -153,4 +153,10 @@ $ sudo aptitude install tmux
 $ tmux -c ./manage.py celery worker --loglevel=info
 $ python manage.py runserver
 
+Versions on git
+---------------
+
+stable branch    : current version  for production server with nginx config (and tina branch for tina/apache server)
+testing branch   : current version for users' tests
+unstable branch  : current version for developers
 

init/dependances.sh

@@ -29,6 +29,9 @@ sudo apt-get install gfortran
 sudo apt-get install libopenblas-dev
 sudo apt-get install liblapack-dev
 
+#nlpserver
+sudo apt-get install libgflags-dev
+sudo aptitude install libgoogle-glog-dev
 
 source /srv/gargantext_env/bin/activate
 pip3 install git+https://github.com/mathieurodic/aldjemy.git

parsing/Taggers/nlpserver/nlpserver

@@ -15,7 +15,7 @@ DAEMON_PID=/tmp/$DAEMON_NAME.pid
  
 do_start () {
     log_daemon_msg "Starting system '$DAEMON_NAME' daemon..."
-    start-stop-daemon --start --quiet \
+    /sbin/start-stop-daemon --start --quiet \
         --make-pidfile --pidfile $DAEMON_PID --background \
         --startas /bin/bash -- -c "python3 $DAEMON_SCRIPT $DAEMON_ARGS > /tmp/$DAEMON_NAME.log 2>&1"
         # --exec $DAEMON_SCRIPT \
@@ -24,7 +24,7 @@ do_start () {
 }
 do_stop () {
     log_daemon_msg "Stopping system '$DAEMON_NAME' daemon..."
-    start-stop-daemon --stop --pidfile $DAEMON_PID --retry 10
+    /sbin/start-stop-daemon --stop --pidfile $DAEMON_PID --retry 10
     log_end_msg $?
 }