Skip to content

Critical error during site deletion when using external MySQL host #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2014
Merged

Critical error during site deletion when using external MySQL host #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f58e1a9
Fixed site deletion when using external MySQL host
brennentsmith Oct 14, 2014
a045452
Typo when deleting non-existent site.
brennentsmith Oct 14, 2014
08404d9
Use Global Grant Host variable instead of local. Dialog is updated to…
brennentsmith Oct 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/easyengine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ elif [ "$EE_FIRST" = "site" ]; then

# Check the $EE_DOMAIN exist or not
if [ ! -f /etc/nginx/sites-available/$EE_DOMAIN ]; then
ee_lib_error "$EE_DOMAIN not exist, exit status = " $?
ee_lib_error "$EE_DOMAIN does not exist, exit status = " $?
fi

# Use default whenever possible
Expand Down
4 changes: 2 additions & 2 deletions src/modules/site/delete/ee_mod_delete_database.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +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"
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
Expand All @@ -30,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" \
Expand Down