From ab9fe75f6ddaabf122ef1fd05684820b60513810 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 29 Oct 2020 10:38:51 +0530 Subject: [PATCH] fix: query to set db creds after new site creation --- build/common/commands/new.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/build/common/commands/new.py b/build/common/commands/new.py index 10fce846..d1452320 100644 --- a/build/common/commands/new.py +++ b/build/common/commands/new.py @@ -83,25 +83,17 @@ def main(): mysql_command = ["mysql", f"-h{db_host}", f"-u{db_root_username}", f"-p{mariadb_root_password}", "-e"] # Drop User if exists - command = mysql_command + [f"DROP USER IF EXISTS '{db_name}'@'%'; FLUSH PRIVILEGES;"] + command = mysql_command + [f"DROP USER IF EXISTS '{db_name}'; FLUSH PRIVILEGES;"] run_command(command) - # update User's host to '%' required to connect from any container - command = mysql_command + [f"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;"] - run_command(command) - - # Set db password - command = mysql_command + [f"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] - run_command(command) - - # Grant permission to database + # Grant permission to database and set password grant_privileges = "ALL PRIVILEGES" # for Amazon RDS if config.get(RDS_DB) or site_config.get(RDS_DB): grant_privileges = RDS_PRIVILEGES - command = mysql_command + [f"GRANT {grant_privileges} ON `{db_name}`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"] + command = mysql_command + [f"GRANT {grant_privileges} ON `{db_name}`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(command) if frappe.redis_server: