Tomas Cohen Arazi
7ec644da06
Apache 2.4 expects the sites definition files use the sufix '.conf' To reproduce: - Install the 'koha-common' package on Debian 7 or Ubuntu 13.10+ (both known to include Apache 2.4). - Create an instance (for example testlibrary) using the supplied commands: $ koha-create --create-db testlibrary > FAIL: apache reports an error like this: "ERROR: Site testlibrary does not exist!" This patch adds a test on the Apache version and appends the ".conf" sufix if needed. To test: 1st step: koha-create gets fixed: -- The hard way -- - Apply the patch, and build the koha-common package on top of this commit. - Install the built package on an Apache 2.4 Debian-based distro (Debian 7 or Ubuntu 13.10 will work) - Create a test instance: $ koha-create --create-db testlibrary > SUCCESS: no more apache sites related error. -- The easy way -- - Apply the patch, and copy the koha-create into an Apache 2.4 Debian-based distro - Create a test instance using the koha-create script you just copied: $ ./koha-create --create-db testlibrary > SUCCESS: no more apache sites related error. 2nd step: the rest of the touched scripts keep working as usual koha-disable koha-dump koha-enable koha-list koha-remove koha-restart-zebra koha-stop-zebra koha-start-zebra They should all keep working. Can be tested "the easy way" too. Note: there might be another issues regarding Apache 2.4 deployments like the need for $ a2enmod access_compat and perhaps some directory permissions tweak, which I think should be properly documented on the install instructions. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
102 lines
3.7 KiB
Bash
Executable file
102 lines
3.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# koha-remove -- Remove a Koha instance.
|
|
# Copyright 2010 Catalyst IT, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
set -e
|
|
|
|
args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
|
|
eval set -- $args
|
|
while [ ! -z "$1" ]
|
|
do
|
|
case "$1" in
|
|
-k|--keep-mysql) keepmysql=1; shift;;
|
|
--) shift; break;;
|
|
*) break;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
NAMES="$@"
|
|
|
|
SITECONFDIR="/etc/koha/sites"
|
|
# There has to be a better way of excluding '.' from find. But this works.
|
|
INSTANCES=`cd $SITECONFDIR && find . -type d -printf " %f" |sed s/\ .\ //`
|
|
|
|
if [ -z $NAMES ] ; then
|
|
echo "Please specify a Koha instance name. Your choices are:"
|
|
echo "$INSTANCES"
|
|
exit 1
|
|
fi
|
|
|
|
for name in $NAMES
|
|
do
|
|
# Does the directory (ie instance) name exist?
|
|
if [ ! -d $SITECONFDIR/$name ] ; then
|
|
echo Koha configuration directory for instance \"$name\" does not exist, please specify a valid Koha instance
|
|
exit 1
|
|
fi
|
|
|
|
echo "Removing Koha instance $name"
|
|
mysql_hostname="localhost"
|
|
if [ "$keepmysql" != "1" ]
|
|
then
|
|
# The grant creates the user in case it isn't, we don't want our loop to fail if it has already being deleted.
|
|
mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
|
|
GRANT USAGE ON \`koha_$name\`.* TO \`koha_$name\`@\`%\`;
|
|
GRANT USAGE ON \`koha_$name\`.* TO \`koha_$name\`@\`$mysql_hostname\`;
|
|
DROP USER \`koha_$name\`@\`%\`;
|
|
DROP USER \`koha_$name\`@\`$mysql_hostname\`;
|
|
DROP DATABASE IF EXISTS \`koha_$name\`;
|
|
FLUSH PRIVILEGES;
|
|
eof
|
|
fi #`
|
|
|
|
# If the daemon is not running already, we don't want to fail this loop. So bin the result code if this fails.
|
|
koha-stop-zebra $name || /bin/true
|
|
|
|
instancefile="$name.conf"
|
|
|
|
[ -f "/etc/apache2/sites-available/$instancefile" ] && \
|
|
rm "/etc/apache2/sites-available/$instancefile"
|
|
[ -f "/etc/koha/sites/$name/koha-conf.xml" ] && \
|
|
rm "/etc/koha/sites/$name/koha-conf.xml"
|
|
[ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
|
|
rm "/etc/koha/sites/$name/zebra-biblios.cfg"
|
|
[ -f "/etc/koha/sites/$name/zebra-biblios-dom.cfg" ] && \
|
|
rm "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
|
|
[ -f "/etc/koha/sites/$name/zebra-authorities.cfg" ] && \
|
|
rm "/etc/koha/sites/$name/zebra-authorities.cfg"
|
|
[ -f "/etc/koha/sites/$name/zebra-authorities-dom.cfg" ] && \
|
|
rm "/etc/koha/sites/$name/zebra-authorities-dom.cfg"
|
|
[ -f "/etc/koha/sites/$name/zebra.passwd" ] && \
|
|
rm "/etc/koha/sites/$name/zebra.passwd"
|
|
# Maybe a user has left something in the config directory they want to keep? We won't delete it here, nor throw an error if the have.
|
|
[ -d "/etc/koha/sites/$name" ] && \
|
|
rmdir --ignore-fail-on-non-empty "/etc/koha/sites/$name"
|
|
[ -d "/var/lock/koha/$name" ] && \
|
|
rm -r "/var/lock/koha/$name"
|
|
[ -d "/var/log/koha/$name" ] && \
|
|
rm -r "/var/log/koha/$name"
|
|
[ -d "/var/run/koha/$name" ] && \
|
|
rm -r "/var/run/koha/$name"
|
|
getent passwd "$name-koha" > /dev/null && deluser --quiet "$name-koha"
|
|
# in case the site has already been disabled, we don't want to break the loop now.
|
|
a2dissite "$name" || /bin/true
|
|
done
|
|
|
|
service apache2 restart
|