Bugzilla – Attachment 33996 Details for
Bug 12856
koha-disable fails without disabling site
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12856: koha-disable fails without disabling site
PASSED-QA-Bug-12856-koha-disable-fails-without-dis.patch (text/plain), 2.57 KB, created by
Tomás Cohen Arazi (tcohen)
on 2014-11-27 14:39:20 UTC
(
hide
)
Description:
[PASSED QA] Bug 12856: koha-disable fails without disabling site
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2014-11-27 14:39:20 UTC
Size:
2.57 KB
patch
obsolete
>From c08c8fde59fd96e4b8f047286f054a361d598c0b Mon Sep 17 00:00:00 2001 >From: Liz Rea <liz@catalyst.net.nz> >Date: Tue, 7 Oct 2014 09:35:19 +1300 >Subject: [PATCH] [PASSED QA] Bug 12856: koha-disable fails without disabling > site > >To test: >Package up a branch with this patch >install that package >create a site - sudo koha-create --create-db testdisable >enable a site - sudo koha-enable testdisable >check it's enabled - sudo koha-list --enabled >* it should show up >disable a site - sudo koha-disable testdisable >Do this for both debian squeeze/wheezy and ubuntu 12.04 and 14.04, if you can. I'd like to see a sign off from a debian (sq/wh)eez(e/y) or ubuntu 12 user, because I could only test reliably on ubuntu 14.04. >* make sure apache restarts and no errors are produced >check it's disabled - sudo koha-list --enabled >* it should not show up >check the site is still there - sudo koha-list >* it should still be there >check that the config file has the Include for disabling uncommented >* the line Include /etc/koha/apache-shared-disable.conf should not have a # in front. >Re-enable the site - sudo koha-enable testdisable >* the line Include /etc/koha/apache-shared-disable.conf should have a # in front. > >And the final question - does the site work? All other functions unchanged? > >Signed-off-by: Mason James <mtj@kohaaloha.com> >Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> >Works as expected. code reads better too. >Edit: I added a missing space in one line. >--- > debian/scripts/koha-disable | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > >diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable >index 762ac13..b03ed80 100755 >--- a/debian/scripts/koha-disable >+++ b/debian/scripts/koha-disable >@@ -29,19 +29,16 @@ fi > > disable_instance() > { >- local site=$1 >- local instancefile=$(get_apache_config_for $site) >+ local instancename=$1 >+ local instancefile=$(get_apache_config_for "$instancename") > >- if [ "$instancefile" = ""]; then >- return 2 >- fi >- >- if is_enabled $instancename; then >- sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' \ >- "$instancefile" >- return 0 >+ if [ "$instancefile" = "" ]; then >+ echo 2 >+ elif is_enabled $instancename; then >+ sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' "$instancefile" >+ echo 0 > else >- return 1 >+ echo 1 > fi > } > >@@ -60,7 +57,6 @@ EOF > [ $# -ge 1 ] || ( usage ; die "Missing instance name..." ) > > restart_apache="no" >- > for name in "$@" > do > if is_instance $name ; then >-- >1.9.1
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 12856
:
32022
|
32023
|
32051
| 33996