Bug 26803: Fix PLUGIN_DIR when plugin_dirs is multivalued

[srvgit] / debian / koha-common.init

diff --git a/debian/koha-common.init b/debian/koha-common.init
index ad41874..4b8e759 100755 (executable)
--- a/debian/koha-common.init
+++ b/debian/koha-common.init
@@ -1,14 +1,17 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          koha-common
-# Required-Start:    $remote_fs
+# Required-Start:    $remote_fs memcached
 # Required-Stop:     $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start Zebra server for each Koha instance
+# Short-Description: Start required services for each Koha instance
 # Description:       For each enabled Koha instance on this host,
-#                    as listed by "koha-list --enabled", start a Zebra
-#                    server (using koha-start-zebra).
+#                    if enabled, start:
+#                      - a Zebra server (using koha-zebra)
+#                      - a Plack server (using koha-plack)
+#                      - a SIP server   (using koha-sip)
+#                      - a Z3950 server (using koha-z3950-responder)
 ### END INIT INFO
 
 # Author: Lars Wirzenius <lars@catalyst.net.nz>
@@ -22,7 +25,7 @@ NAME="koha-common"
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
-[ -x /usr/sbin/koha-start-zebra ] || exit 0
+[ -x /usr/sbin/koha-zebra ] || exit 0
 
 # Read configuration variable file if it is present
 if [ -r /etc/default/$NAME ]; then
@@ -55,9 +58,11 @@ do_start()
 {
     # We insure all required directories exist, including disabled ones.
     koha-create-dirs $(koha-list)
-    koha-start-zebra $(koha-list --enabled)
-    koha-start-sip $(koha-list --enabled)
-    koha-plack --start --quiet $(koha-list --enabled --plack)
+    koha-zebra --start $(koha-list --enabled)
+    koha-sip   --start $(koha-list --enabled --sip)
+    koha-plack --start $(koha-list --enabled --plack)
+    koha-z3950-responder --start --quiet $(koha-list --enabled --z3950)
+    koha-worker --start $(koha-list --enabled)
 
     if [ "$USE_INDEXER_DAEMON" = "yes" ]; then
         koha-indexer --start --quiet $(koha-list --enabled)
@@ -70,9 +75,11 @@ do_start()
 do_stop()
 {
     # We stop everything, including disabled ones.
-    koha-stop-zebra $(koha-list) || true
-    koha-stop-sip $(koha-list) || true
+    koha-zebra --stop $(koha-list) || true
+    koha-sip   --stop $(koha-list --sip)
     koha-plack --stop --quiet $(koha-list --enabled --plack)
+    koha-z3950-responder --stop --quiet $(koha-list --enabled --z3950)
+    koha-worker --stop --quiet $(koha-list --enabled)
 
     if [ "$USE_INDEXER_DAEMON" = "yes" ]; then
         koha-indexer --stop --quiet $(koha-list --enabled)
@@ -83,10 +90,11 @@ do_stop()
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-    koha-restart-zebra $(koha-list --enabled)
-    koha-stop-sip $(koha-list) || true
-    koha-start-sip $(koha-list --enabled)
+    koha-zebra --restart $(koha-list --enabled)
+    koha-sip   --restart $(koha-list --enabled --sip)
     koha-plack --restart --quiet $(koha-list --enabled --plack)
+    koha-z3950-responder --restart --quiet $(koha-list --enabled --z3950)
+    koha-worker --restart --quiet $(koha-list --enabled)
 
     if [ "$USE_INDEXER_DAEMON" = "yes" ]; then
         koha-indexer --restart --quiet $(koha-list --enabled)
@@ -147,6 +155,24 @@ plack_status()
     done
 }
 
+#
+# Function that shows the status of the Z39.50/SRU server daemon for
+# enabled instances
+#
+z3950_status()
+{
+    for instance in $(koha-list --enabled --z3950); do
+
+        log_daemon_msg "Z39.50/SRU daemon running for instance ${instance}"
+
+        if is_z3950_running $instance ; then
+            log_end_msg 0
+        else
+            log_end_msg 1
+        fi
+    done
+}
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
@@ -189,6 +215,7 @@ case "$1" in
         zebra_status
         sip_status
         plack_status
+        z3950_status
         ;;
   *)
     echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2