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

bug fix for ubuntu and docker manager

Browse Source
This commit is contained in:
Usman Nasir
2019-07-24 22:37:37 +05:00
parent 33ed372cec
commit 91c9c22f38
20 changed files with 156 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
plogical/backupUtilities.py
View File

@@ -102,7 +102,13 @@ class backupUtilities:
databasesXML = Element('Databases')
for items in databases:
dbuser = DBUsers.objects.get(user=items.dbUser)
try:
dbuser = DBUsers.objects.get(user=items.dbUser)
except:
dbusers = DBUsers.objects.all().filter(user=items.dbUser)
for it in dbusers:
dbuser = it
break
databaseXML = Element('database')
@@ -154,8 +160,8 @@ class backupUtilities:
metaFileXML.append(dnsRecordsXML)
except:
pass
except BaseException, msg:
logging.CyberCPLogFileWriter.statusWriter(status, '%s. [158:prepMeta]' % (str(msg)))
## Email accounts XML
@@ -175,9 +181,8 @@ class backupUtilities:
emailRecordsXML.append(emailRecordXML)
metaFileXML.append(emailRecordsXML)
except:
pass
except BaseException, msg:
logging.CyberCPLogFileWriter.statusWriter(status, '%s. [179:prepMeta]' % (str(msg)))
## Email meta generated!
@@ -1009,25 +1014,45 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
##
command = 'mkdir -p %s' % (backupPath)
ProcessUtilities.executioner(command)
if not os.path.exists(backupPath) or not os.path.islink(backupPath):
command = 'mkdir -p %s' % (backupPath)
ProcessUtilities.executioner(command)
else:
return 0
command = 'chown -R %s:%s %s' % (website.externalApp, website.externalApp, backupPath)
ProcessUtilities.executioner(command)
if not os.path.exists(backupPath) or not os.path.islink(backupPath):
command = 'chown -R %s:%s %s' % (website.externalApp, website.externalApp, backupPath)
ProcessUtilities.executioner(command)
else:
return 0
##
if not os.path.exists(tempStoragePath) or not os.path.islink(tempStoragePath):
command = 'mkdir -p %s' % (tempStoragePath)
ProcessUtilities.executioner(command)
else:
return 0
command = 'mkdir -p %s' % (tempStoragePath)
ProcessUtilities.executioner(command)
command = 'chown -R %s:%s %s' % (website.externalApp, website.externalApp, tempStoragePath)
ProcessUtilities.executioner(command)
if not os.path.exists(tempStoragePath) or not os.path.islink(tempStoragePath):
command = 'chown -R %s:%s %s' % (website.externalApp, website.externalApp, tempStoragePath)
ProcessUtilities.executioner(command)
else:
return 0
##
if not os.path.exists(status) or not os.path.islink(status):
command = 'touch %s' % (status)
ProcessUtilities.executioner(command)
else:
return 0
if not os.path.exists(status) or not os.path.islink(status):
command = 'chown cyberpanel:cyberpanel %s' % (status)
ProcessUtilities.executioner(command)
else:
return 0
command = 'chown cyberpanel:cyberpanel %s' % (status)
ProcessUtilities.executioner(command)
result = backupUtilities.prepareBackupMeta(backupDomain, backupName, tempStoragePath, backupPath)
@@ -1052,11 +1077,6 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
backupMetaData = ElementTree.parse(result[2])
if os.path.islink(status) or os.path.islink(tempStoragePath or os.path.islink(backupPath)) or os.path.islink(
result[2]):
logging.CyberCPLogFileWriter.writeToFile('symlinked.')
return 0
databases = backupMetaData.findall('Databases/database')
for database in databases: