Bug 5313 - allow creation of libraries with hyphens
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
parent
554b6ad340
commit
4f4c4eceb3
|
|
@ -125,19 +125,17 @@ then
|
|||
|
||||
# Generate Zebra database password.
|
||||
zebrapwd="$(pwgen -1)"
|
||||
|
||||
# Set up MySQL database for this instance.
|
||||
if [ "$op" = create ]
|
||||
then
|
||||
mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
|
||||
CREATE DATABASE $mysqldb;
|
||||
CREATE USER '$mysqluser'@'%' IDENTIFIED BY '$mysqlpwd';
|
||||
GRANT ALL PRIVILEGES ON $mysqldb.* TO '$mysqluser';
|
||||
CREATE DATABASE \`$mysqldb\`;
|
||||
CREATE USER \`$mysqluser\`@'%' IDENTIFIED BY '$mysqlpwd';
|
||||
GRANT ALL PRIVILEGES ON \`$mysqldb\`.* TO \`$mysqluser\`;
|
||||
FLUSH PRIVILEGES;
|
||||
eof
|
||||
fi
|
||||
|
||||
|
||||
# Generate and install Apache site-available file and log dir.
|
||||
generate_config_file apache-site.conf.in \
|
||||
"/etc/apache2/sites-available/$name"
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ do
|
|||
echo "Removing Koha instance $name"
|
||||
|
||||
mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
|
||||
DROP USER 'koha_$name';
|
||||
DROP DATABASE koha_$name;
|
||||
DROP USER \`koha_$name\`;
|
||||
DROP DATABASE \`koha_$name\`;
|
||||
FLUSH PRIVILEGES;
|
||||
eof
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue