Bugzilla – Attachment 71995 Details for
Bug 20234
Make maintenance scripts use koha-zebra instead of koha-*-zebra
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20234: Make maintenance scripts use koha-zebra instead of koha-*-zebra
Bug-20234-Make-maintenance-scripts-use-koha-zebra-.patch (text/plain), 4.74 KB, created by
Hugo Agud
on 2018-02-20 11:35:33 UTC
(
hide
)
Description:
Bug 20234: Make maintenance scripts use koha-zebra instead of koha-*-zebra
Filename:
MIME Type:
Creator:
Hugo Agud
Created:
2018-02-20 11:35:33 UTC
Size:
4.74 KB
patch
obsolete
>From 7b4468707846e9a6411b70c48a85f69e7730407c Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Sat, 17 Feb 2018 11:34:58 -0300 >Subject: [PATCH] Bug 20234: Make maintenance scripts use koha-zebra instead of > koha-*-zebra > >This patch makes all maintenance scripts use **koha-zebra** instead of >the old **koha-*-zebra** scripts. > >To test: >- Run: > $ perl misc4dev/cp_debian_files.pl > $ sudo service koha-common stop >=> SUCCESS: No errors and the Zebra-related sevices are stopped > $ sudo service koha-common start >=> SUCCESS: No errors and the Zebra-related services are started > $ sudo service koha-common restart >=> SUCCESS: No erros and Zebra-related services are running > $ sudo koha-create --create-db test >=> SUCCESS: Instance created and zebra running for it > $ sudo koha-disable test >=> SUCCESS: No errors and Zebra is stopped for instance test > $ sudo koha-zebra --start test > $ sudo koha-remove test >=> SUCCESS: No errors, instance removed, no Zebra running for test >- Sign off :-D > >Sponsored-by: Orex Digital > >Signed-off-by: Your Full Name <your_email> >--- > 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 b461056..99eb19b 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-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,7 +55,7 @@ do_start() > { > # We insure all required directories exist, including disabled ones. > koha-create-dirs $(koha-list) >- koha-start-zebra $(koha-list --enabled) >+ koha-zebra --start $(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-stop-zebra $(koha-list) || true >+ koha-zebra --stop $(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-restart-zebra $(koha-list --enabled) >+ koha-zebra --restart $(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 5b6663a..3d8f7c0 100644 >--- a/debian/koha-common.logrotate >+++ b/debian/koha-common.logrotate >@@ -9,12 +9,12 @@ > notifempty > sharedscripts > prerotate >- /usr/sbin/koha-stop-zebra $(koha-list --enabled) > /dev/null >+ /usr/sbin/koha-zebra --stop $(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-start-zebra $(koha-list --enabled) > /dev/null >+ /usr/sbin/koha-zebra --start $(koha-list --enabled) > /dev/null > endscript > } >diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create >index aa01f80..3f85cb2 100755 >--- a/debian/scripts/koha-create >+++ b/debian/scripts/koha-create >@@ -819,7 +819,7 @@ then > service apache2 restart > > # Start Zebra. >- koha-start-zebra "$name" >+ koha-zebra --start "$name" > > if [ "$USE_INDEXER_DAEMON" = "yes" ]; then > # Start Indexer daemon >diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable >index 2e2e67a..e9169f1 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-stop-zebra $name >+ koha-zebra --stop $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 0684780..65e7a03 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-stop-zebra $name || /bin/true >+ koha-zebra --stop $name || /bin/true > fi > # Stop the indexer daemon if needed > if is_indexer_running $name; then >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20234
:
71881
|
71882
|
71995
|
71996
|
72038
|
72039