mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2025-11-14 09:16:11 +01:00
bug fix: create proper backups incase of multiple database users
This commit is contained in:
@@ -598,6 +598,8 @@ class backupUtilities:
|
|||||||
|
|
||||||
## Create databases
|
## Create databases
|
||||||
|
|
||||||
|
### This code is just to create databases, database users will be created later
|
||||||
|
|
||||||
databases = backupMetaData.findall('Databases/database')
|
databases = backupMetaData.findall('Databases/database')
|
||||||
website = Websites.objects.get(domain=domain)
|
website = Websites.objects.get(domain=domain)
|
||||||
|
|
||||||
@@ -606,7 +608,6 @@ class backupUtilities:
|
|||||||
dbName = database.find('dbName').text
|
dbName = database.find('dbName').text
|
||||||
|
|
||||||
if VERSION == '2.1' and BUILD == '1':
|
if VERSION == '2.1' and BUILD == '1':
|
||||||
first = 1
|
|
||||||
|
|
||||||
databaseUsers = database.findall('databaseUsers')
|
databaseUsers = database.findall('databaseUsers')
|
||||||
|
|
||||||
@@ -614,14 +615,12 @@ class backupUtilities:
|
|||||||
|
|
||||||
dbUser = databaseUser.find('dbUser').text
|
dbUser = databaseUser.find('dbUser').text
|
||||||
|
|
||||||
if first:
|
if mysqlUtilities.mysqlUtilities.createDatabase(dbName, dbUser, "cyberpanel") == 0:
|
||||||
if mysqlUtilities.mysqlUtilities.createDatabase(dbName, dbUser, "cyberpanel") == 0:
|
raise BaseException("Failed to create Databases!")
|
||||||
raise BaseException("Failed to create Databases!")
|
|
||||||
|
|
||||||
newDB = Databases(website=website, dbName=dbName, dbUser=dbUser)
|
|
||||||
newDB.save()
|
|
||||||
first = 0
|
|
||||||
|
|
||||||
|
newDB = Databases(website=website, dbName=dbName, dbUser=dbUser)
|
||||||
|
newDB.save()
|
||||||
|
break
|
||||||
|
|
||||||
else:
|
else:
|
||||||
dbUser = database.find('dbUser').text
|
dbUser = database.find('dbUser').text
|
||||||
@@ -855,6 +854,8 @@ class backupUtilities:
|
|||||||
|
|
||||||
## restoring databases
|
## restoring databases
|
||||||
|
|
||||||
|
### This will actually restore mysql dump and create mysql users
|
||||||
|
|
||||||
logging.CyberCPLogFileWriter.statusWriter(status, "Restoring Databases!")
|
logging.CyberCPLogFileWriter.statusWriter(status, "Restoring Databases!")
|
||||||
|
|
||||||
databases = backupMetaData.findall('Databases/database')
|
databases = backupMetaData.findall('Databases/database')
|
||||||
|
|||||||
Reference in New Issue
Block a user