|
@ -981,7 +981,7 @@ class EESiteUpdateController(CementBaseController): |
|
|
Log.info(self, "\n\n" + Log.ENDC + "WordPress admin user :" |
|
|
Log.info(self, "\n\n" + Log.ENDC + "WordPress admin user :" |
|
|
" {0}".format(ee_wp_creds['wp_user'])) |
|
|
" {0}".format(ee_wp_creds['wp_user'])) |
|
|
Log.info(self, Log.ENDC + "WordPress admin password : {0}" |
|
|
Log.info(self, Log.ENDC + "WordPress admin password : {0}" |
|
|
.format(ee_wp_creds['wp_pass']) + "\n\n") |
|
|
.format(ee_wp_creds['wp_pass']) + "\n\n") |
|
|
updateSiteInfo(self, ee_www_domain, stype=stype, cache=cache) |
|
|
updateSiteInfo(self, ee_www_domain, stype=stype, cache=cache) |
|
|
Log.info(self, "Successfully updated site" |
|
|
Log.info(self, "Successfully updated site" |
|
|
" http://{0}".format(ee_domain)) |
|
|
" http://{0}".format(ee_domain)) |
|
@ -1100,15 +1100,15 @@ class EESiteDeleteController(CementBaseController): |
|
|
'DB_HOST').split(',')[1] |
|
|
'DB_HOST').split(',')[1] |
|
|
.split(')')[0].strip().replace('\'', '')) |
|
|
.split(')')[0].strip().replace('\'', '')) |
|
|
try: |
|
|
try: |
|
|
Log.debug(self, "dropping database {0}".format(ee_db_name)) |
|
|
Log.debug(self, "dropping database `{0}`".format(ee_db_name)) |
|
|
EEMysql.execute(self, |
|
|
EEMysql.execute(self, |
|
|
"drop database {0}".format(ee_db_name), |
|
|
"drop database `{0}``".format(ee_db_name), |
|
|
errormsg='Unable to drop database {0}' |
|
|
errormsg='Unable to drop database {0}' |
|
|
.format(ee_db_name)) |
|
|
.format(ee_db_name)) |
|
|
if ee_db_user != 'root': |
|
|
if ee_db_user != 'root': |
|
|
Log.debug(self, "dropping user {0}".format(ee_db_user)) |
|
|
Log.debug(self, "dropping user `{0}`".format(ee_db_user)) |
|
|
EEMysql.execute(self, |
|
|
EEMysql.execute(self, |
|
|
"drop user {0}@{1}" |
|
|
"drop user `{0}`@`{1}`" |
|
|
.format(ee_db_user, ee_db_host)) |
|
|
.format(ee_db_user, ee_db_host)) |
|
|
EEMysql.execute(self, |
|
|
EEMysql.execute(self, |
|
|
"flush privileges") |
|
|
"flush privileges") |
|
|