From c1d9e6a8324efbbecccf847106b02923ff7ef897 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 3 Sep 2020 19:24:12 +0500 Subject: [PATCH] bug fix for mysql 10.5 --- install/installCyberPanel.py | 5 +++-- plogical/mysqlUtilities.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index abad1a487..f3f2ada46 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -283,10 +283,11 @@ gpgcheck=1 def changeMYSQLRootPassword(self): if self.remotemysql == 'OFF': + if self.distro == ubuntu: - passwordCMD = "use mysql;update user set password=PASSWORD('" + InstallCyberPanel.mysql_Root_password + "') where User='root';UPDATE user SET plugin='' WHERE User='root';flush privileges;" + passwordCMD = "use mysql;GRANT ALL PRIVILEGES ON . TO 'root'@'localhost' IDENTIFIED BY '%s';update user set password=PASSWORD('" % (InstallCyberPanel.mysql_Root_password) + InstallCyberPanel.mysql_Root_password + "') where User='root';UPDATE user SET plugin='' WHERE User='root';flush privileges;" else: - passwordCMD = "use mysql;update user set password=PASSWORD('" + InstallCyberPanel.mysql_Root_password + "') where User='root';flush privileges;" + passwordCMD = "use mysql;GRANT ALL PRIVILEGES ON . TO 'root'@'localhost' IDENTIFIED BY '%s';update user set password=PASSWORD('" % (InstallCyberPanel.mysql_Root_password) + InstallCyberPanel.mysql_Root_password + "') where User='root';flush privileges;" command = 'mysql -u root -e "' + passwordCMD + '"' diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 2fc0da657..708784260 100755 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -95,9 +95,13 @@ class mysqlUtilities: password = data.split('\n', 1)[0] password = password.strip('\n').strip('\r') + logging.CyberCPLogFileWriter.writeToFile(repr(password)) + conn = mysql.connect(user='root', passwd=password, cursorclass=cursors.SSCursor) cursor = conn.cursor() + logging.CyberCPLogFileWriter.writeToFile(str(cursor)) + return conn, cursor except BaseException as msg: