From bcba76efad51c4e118181fc2dbd3557321ebacb4 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 26 Jan 2018 18:36:21 +0000 Subject: [PATCH] Bug 18617: Follow up - correctly check plack.enabled file first This patch was required, because without it, the apache2 config grepping logic was preventing the elif from checking the existence of the enabled file. --- debian/scripts/koha-functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh index e628990..a0087a7 100755 --- a/debian/scripts/koha-functions.sh +++ b/debian/scripts/koha-functions.sh @@ -190,7 +190,9 @@ is_plack_enabled() local site=$1 local instancefile=$(get_apache_config_for $site) - if [ "$instancefile" = "" ]; then + if [ -e /var/lib/koha/$site/plack.enabled ]; then + return 0 + elif [ "$instancefile" = "" ]; then return 1 fi @@ -199,8 +201,6 @@ is_plack_enabled() grep -q '^[[:space:]]*Include /etc/koha/apache-shared-intranet-plack.conf' \ "$instancefile" ; then return 0 - elif [ -e /var/lib/koha/$instancename/plack.enabled ]; then - return 0 else return 1 fi -- 2.1.4