From 8314711a0e1dec71dda27f7b40be4d95944bd924 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Wed, 16 May 2018 08:22:53 +0200
Subject: [PATCH] Revert "Bug 20234: Make maintenance scripts use koha-zebra
 instead of koha-*-zebra"

This reverts commit 443fb91be5805863633439afb4b2eefb7a164112.
---
 debian/koha-common.init      | 8 ++++----
 debian/koha-common.logrotate | 4 ++--
 debian/scripts/koha-create   | 2 +-
 debian/scripts/koha-disable  | 2 +-
 debian/scripts/koha-remove   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/koha-common.init b/debian/koha-common.init
index 99eb19b9f3..b461056a7e 100755
--- a/debian/koha-common.init
+++ b/debian/koha-common.init
@@ -22,7 +22,7 @@ NAME="koha-common"
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
-[ -x /usr/sbin/koha-zebra ] || exit 0
+[ -x /usr/sbin/koha-start-zebra ] || exit 0
 
 # Read configuration variable file if it is present
 if [ -r /etc/default/$NAME ]; then
@@ -55,7 +55,7 @@ do_start()
 {
     # We insure all required directories exist, including disabled ones.
     koha-create-dirs $(koha-list)
-    koha-zebra --start $(koha-list --enabled)
+    koha-start-zebra $(koha-list --enabled)
     koha-start-sip $(koha-list --enabled)
     koha-plack --start $(koha-list --enabled --plack)
 
@@ -70,7 +70,7 @@ do_start()
 do_stop()
 {
     # We stop everything, including disabled ones.
-    koha-zebra --stop $(koha-list) || true
+    koha-stop-zebra $(koha-list) || true
     koha-stop-sip $(koha-list) || true
     koha-plack --stop --quiet $(koha-list --enabled --plack)
 
@@ -83,7 +83,7 @@ do_stop()
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-    koha-zebra --restart $(koha-list --enabled)
+    koha-restart-zebra $(koha-list --enabled)
     koha-stop-sip $(koha-list) || true
     koha-start-sip $(koha-list --enabled)
     koha-plack --restart --quiet $(koha-list --enabled --plack)
diff --git a/debian/koha-common.logrotate b/debian/koha-common.logrotate
index 3d8f7c0245..5b6663a746 100644
--- a/debian/koha-common.logrotate
+++ b/debian/koha-common.logrotate
@@ -9,12 +9,12 @@
     notifempty
     sharedscripts
     prerotate
-        /usr/sbin/koha-zebra --stop $(koha-list --enabled) > /dev/null
+        /usr/sbin/koha-stop-zebra $(koha-list --enabled) > /dev/null
         /usr/sbin/koha-plack --stop --quiet $(koha-list --enabled --plack) > /dev/null
     endscript
     postrotate
         /etc/init.d/apache2 reload > /dev/null
         /usr/sbin/koha-plack --start --quiet $(koha-list --enabled --plack) > /dev/null
-        /usr/sbin/koha-zebra --start $(koha-list --enabled) > /dev/null
+        /usr/sbin/koha-start-zebra $(koha-list --enabled) > /dev/null
     endscript
 }
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 03bfb62ba5..b0afd5845d 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -813,7 +813,7 @@ then
     service apache2 restart
 
     # Start Zebra.
-    koha-zebra --start "$name"
+    koha-start-zebra "$name"
 
     if [ "$USE_INDEXER_DAEMON" = "yes" ]; then
         # Start Indexer daemon
diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable
index e9169f1a21..2e2e67ab5c 100755
--- a/debian/scripts/koha-disable
+++ b/debian/scripts/koha-disable
@@ -67,7 +67,7 @@ do
                 koha-stop-sip $name
             fi
             if is_zebra_running $name; then
-                koha-zebra --stop $name
+                koha-stop-zebra $name
             fi
             if is_indexer_running $name; then
                 koha-indexer --stop $name
diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 8b8325850c..763da29ae5 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -78,7 +78,7 @@ eof
 
     # Stop the Zebra server if needed
     if is_zebra_running $name; then
-        koha-zebra --stop $name || /bin/true
+        koha-stop-zebra $name || /bin/true
     fi
     # Stop the indexer daemon if needed
     if is_indexer_running $name; then
-- 
2.39.5