Bug 4470 Patron search result pagination bar

[koha_gimpoz] / misc / bin / koha-zebra-ctl.sh

diff --git a/misc/bin/koha-zebra-ctl.sh b/misc/bin/koha-zebra-ctl.sh
index 5c0422a..01e4fad 100755 (executable)
--- a/misc/bin/koha-zebra-ctl.sh
+++ b/misc/bin/koha-zebra-ctl.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 USER=__KOHA_USER__
 GROUP=__KOHA_GROUP__
-NAME=koha-zebra-ctl
+DBNAME=__DB_NAME__
+NAME=koha-zebra-ctl.$DBNAME
 LOGDIR=__LOG_DIR__
 ERRLOG=$LOGDIR/koha-zebradaemon.err
 STDOUT=$LOGDIR/koha-zebradaemon.log
@@ -10,10 +11,16 @@ KOHA_CONF=__KOHA_CONF_DIR__/koha-conf.xml
 RUNDIR=__ZEBRA_RUN_DIR__
 LOCKDIR=__ZEBRA_LOCK_DIR__
 # you may need to change this depending on where zebrasrv is installed
-ZEBRASRV=/usr/bin/zebrasrv
+ZEBRASRV=__PATH_TO_ZEBRA__/zebrasrv
+ZEBRAOPTIONS="-v none,fatal,warn"
 
 test -f $ZEBRASRV || exit 0
 
+OTHERUSER=''
+if [[ $EUID -eq 0 ]]; then
+    OTHERUSER="--user=$USER.$GROUP"
+fi
+
 case "$1" in
     start)
       echo "Starting Zebra Server"
@@ -24,25 +31,29 @@ case "$1" in
       if [[ ! -d $RUNDIR ]]; then
         umask 022
         mkdir -p $RUNDIR
-        chown $USER:$GROUP $RUNDIR
+        if [[ $EUID -eq 0 ]]; then
+            chown $USER:$GROUP $RUNDIR
+        fi
       fi
       if [[ ! -d $LOCKDIR ]]; then
         umask 022
         mkdir -p $LOCKDIR
         mkdir -p $LOCKDIR/biblios
         mkdir -p $LOCKDIR/authorities
-        chown -R $USER:$GROUP $LOCKDIR
+        if [[ $EUID -eq 0 ]]; then
+            chown -R $USER:$GROUP $LOCKDIR
+        fi
       fi
 
-      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 --user=$USER.$GROUP -- $ZEBRASRV -f $KOHA_CONF 
+      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER -- $ZEBRASRV $ZEBRAOPTIONS -f $KOHA_CONF 
       ;;
     stop)
       echo "Stopping Zebra Server"
-      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 --user=$USER.$GROUP --stop -- $ZEBRASRV -f $KOHA_CONF 
+      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER --stop -- $ZEBRASRV -f $KOHA_CONF 
       ;;
     restart)
       echo "Restarting the Zebra Server"
-      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 --user=$USER.$GROUP --restart -- $ZEBRASRV -f $KOHA_CONF 
+      daemon --name=$NAME --errlog=$ERRLOG --stdout=$STDOUT --output=$OUTPUT --verbose=1 --respawn --delay=30 $OTHERUSER --restart -- $ZEBRASRV -f $KOHA_CONF 
       ;;
     *)
       echo "Usage: /etc/init.d/$NAME {start|stop|restart}"