Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.0.4-dev' into v2.0.5-dev

Browse Source
This commit is contained in:
Usman Nasir
2021-03-14 10:56:06 +05:00
parent d3479ab65b 48d0a33747
commit ad44831cbf
8 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plogical/mysqlUtilities.py
View File

@@ -27,6 +27,7 @@ class mysqlUtilities:
LOCALHOST = 'localhost'
RDS = 0
REMOTEHOST = ''
@staticmethod
def getPagination(records, toShow):
@@ -67,6 +68,7 @@ class mysqlUtilities:
mysqlpassword = jsonData['mysqlpassword']
mysqlport = jsonData['mysqlport']
mysqlhost = jsonData['mysqlhost']
mysqlUtilities.REMOTEHOST = mysqlhost
if mysqlhost.find('rds.amazon') > -1:
mysqlUtilities.RDS = 1
@@ -114,7 +116,15 @@ class mysqlUtilities:
return 0
cursor.execute("CREATE DATABASE " + dbname)
cursor.execute("CREATE USER '" + dbuser + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + dbpassword+ "'")
if mysqlUtilities.REMOTEHOST.find('ondigitalocean') > -1:
query = "CREATE USER '%s'@'%s' IDENTIFIED WITH mysql_native_password BY '%s'" % (
dbuser, mysqlUtilities.LOCALHOST, dbpassword)
else:
query = "CREATE USER '" + dbuser + "'@'%s' IDENTIFIED BY '" % (
mysqlUtilities.LOCALHOST) + dbpassword + "'"
cursor.execute(query)
if mysqlUtilities.RDS == 0:
cursor.execute("GRANT ALL PRIVILEGES ON " + dbname + ".* TO '" + dbuser + "'@'%s'" % (mysqlUtilities.LOCALHOST))