Browse Source

Use Global Grant Host variable instead of local. Dialog is updated to show Grant Host during deletion process.

bugfixes
Brennen Smith 10 years ago
parent
commit
02372e2917
  1. 9
      src/modules/site/delete/ee_mod_delete_database.sh

9
src/modules/site/delete/ee_mod_delete_database.sh

@ -10,12 +10,7 @@ function ee_mod_delete_database()
local ee_db_user=$(grep DB_USER /var/www/$EE_DOMAIN/*-config.php | cut -d"'" -f4)
local ee_db_pass=$(grep DB_PASS /var/www/$EE_DOMAIN/*-config.php | cut -d"'" -f4)
local ee_db_host=$(grep DB_HOST /var/www/$EE_DOMAIN/*-config.php | cut -d"'" -f4)
ee_lib_echo_escape " DB_NAME = $ee_db_name \n DB_USER = $ee_db_user \n DB_HOST = $ee_db_host"
if [ "$EE_MYSQL_GRANT_HOST" != "localhost" ]; then
# If MySQL grant host is set, use that value instead
ee_db_host=$EE_MYSQL_GRANT_HOST
fi
ee_lib_echo_escape " DB_NAME = $ee_db_name \n DB_USER = $ee_db_user \n DB_HOST = $ee_db_host \n GRANT_HOST = $EE_MYSQL_GRANT_HOST"
if [ "$1" = "--no-prompt" ];then
# Delete database without any prompt
@ -35,7 +30,7 @@ function ee_mod_delete_database()
# Never drop root user
if [ "$ee_db_user" != "root" ]; then
# Drop database user
mysql -e "drop user '$ee_db_user'@'$ee_db_host'" \
mysql -e "drop user '$ee_db_user'@'$EE_MYSQL_GRANT_HOST'" \
|| ee_lib_error "Unable to drop database user $ee_db_user, exit status = " $?
# Flush privileges
mysql -e "flush privileges" \

Loading…
Cancel
Save