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

bug fix in create backups

Browse Source
This commit is contained in:
Usman Nasir
2022-06-14 20:44:20 +05:00
parent 16e2cc06e8
commit d151e50a6e
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
plogical/applicationInstaller.py
View File

@@ -2353,12 +2353,11 @@ $parameters = array(
command = f"cp -R {configPath} {self.tempPath}" command = f"cp -R {configPath} {self.tempPath}"
if ProcessUtilities.executioner(command, VHuser) == 0: if ProcessUtilities.executioner(command, VHuser) == 0:
raise BaseException('Failed to config to temp path.') raise BaseException('Failed to copy config file to temp path.')
command = f"rm -r {configPath}" command = f"rm -r {configPath}"
ProcessUtilities.executioner(command) if ProcessUtilities.executioner(command) == 0:
if ProcessUtilities.executioner(command, VHuser) == 0:
raise BaseException('Failed to remove config.') raise BaseException('Failed to remove config.')
logging.statusWriter(self.tempStatusPath, 'Copying website data.....,50') logging.statusWriter(self.tempStatusPath, 'Copying website data.....,50')
@@ -2403,7 +2402,6 @@ $parameters = array(
websitepath = "/home/%s"%websitedomain websitepath = "/home/%s"%websitedomain
FinalZipPath = '%s/%s.zip' % (websitepath, RandomPath)
command = 'mkdir -p /home/backup/' command = 'mkdir -p /home/backup/'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
@@ -2426,6 +2424,7 @@ $parameters = array(
logging.statusWriter(self.tempStatusPath, 'Completed.[200]') logging.statusWriter(self.tempStatusPath, 'Completed.[200]')
return 1, f"/home/backup/{config['name']}.tar.gz" return 1, f"/home/backup/{config['name']}.tar.gz"
elif Backuptype == "2": elif Backuptype == "2":
###Onlye website data ###Onlye website data
### Create secure folder ### Create secure folder
@@ -2482,13 +2481,11 @@ $parameters = array(
command = f"cp -R {configPath} {self.tempPath}" command = f"cp -R {configPath} {self.tempPath}"
if ProcessUtilities.executioner(command, VHuser) == 0: if ProcessUtilities.executioner(command) == 0:
raise BaseException('Failed to copy config to temp path.') raise BaseException('Failed to copy config file to temp path.')
command = f"rm -r {configPath}" command = f"rm -r {configPath}"
ProcessUtilities.executioner(command) if ProcessUtilities.executioner(command) == 0:
if ProcessUtilities.executioner(command, VHuser) == 0:
raise BaseException('Failed to remove config temp file.') raise BaseException('Failed to remove config temp file.')
logging.statusWriter(self.tempStatusPath, 'Copying website data.....,50') logging.statusWriter(self.tempStatusPath, 'Copying website data.....,50')
@@ -2517,8 +2514,6 @@ $parameters = array(
websitepath = "/home/%s" % websitedomain websitepath = "/home/%s" % websitedomain
FinalZipPath = '%s/%s.zip' % (websitepath, RandomPath)
command = 'mkdir -p /home/backup/' command = 'mkdir -p /home/backup/'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
@@ -2544,12 +2539,20 @@ $parameters = array(
logging.statusWriter(self.tempStatusPath, 'Getting database...,20') logging.statusWriter(self.tempStatusPath, 'Getting database...,20')
command = f'{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_NAME --skip-plugins --skip-themes --path={WPsitepath}' command = f'{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_NAME --skip-plugins --skip-themes --path={WPsitepath}'
stdoutput = ProcessUtilities.outputExecutioner(command, VHuser) retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1)
DataBaseName = stdoutput.rstrip("\n")
if stdoutput.find('Error:') == -1:
DataBaseName = stdoutput.rstrip("\n")
else:
raise BaseException(stdoutput)
command = f'{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_USER --skip-plugins --skip-themes --path={WPsitepath}' command = f'{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_USER --skip-plugins --skip-themes --path={WPsitepath}'
stdoutput = ProcessUtilities.outputExecutioner(command, VHuser) retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1)
DataBaseUser = stdoutput.rstrip("\n")
if stdoutput.find('Error:') == -1:
DataBaseUser = stdoutput.rstrip("\n")
else:
raise BaseException(stdoutput)
### Create secure folder ### Create secure folder
@@ -2601,17 +2604,22 @@ $parameters = array(
os.chmod(configPath, 0o600) os.chmod(configPath, 0o600)
command = f"cp -R {configPath} {self.tempPath}" command = f"cp -R {configPath} {self.tempPath}"
ProcessUtilities.executioner(command, VHuser) if ProcessUtilities.executioner(command) == 0:
raise BaseException('Failed to copy config file to temp path.')
command = f"rm -r {configPath}" command = f"rm -r {configPath}"
ProcessUtilities.executioner(command) if ProcessUtilities.executioner(command) == 0:
raise BaseException('Failed to remove config temp file.')
logging.statusWriter(self.tempStatusPath, 'Copying DataBase.....,70') logging.statusWriter(self.tempStatusPath, 'Copying DataBase.....,70')
##### SQLDUMP database into new directory ##### SQLDUMP database into new directory
command = "mysqldump %s --result-file %s/%s.sql" % (DataBaseName, self.tempPath, DataBaseName) command = "mysqldump %s --result-file %s/%s.sql" % (DataBaseName, self.tempPath, DataBaseName)
result = ProcessUtilities.outputExecutioner(command) retStatus, result = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if retStatus == 0:
raise BaseException(result)
if os.path.exists(ProcessUtilities.debugPath): if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(result) logging.writeToFile(result)
@@ -2627,10 +2635,14 @@ $parameters = array(
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
command = f"tar -czvf /home/backup/{config['name']}.tar.gz -P {self.tempPath}" command = f"tar -czvf /home/backup/{config['name']}.tar.gz -P {self.tempPath}"
result = ProcessUtilities.outputExecutioner(command) retStatus, result = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if retStatus == 0:
raise BaseException(result)
backupobj = WPSitesBackup(owner=Adminobj, WPSiteID=wpsite.id, WebsiteID=website.id, config=json_object) backupobj = WPSitesBackup(owner=Adminobj, WPSiteID=wpsite.id, WebsiteID=website.id, config=json_object)
backupobj.save() backupobj.save()
if os.path.exists(ProcessUtilities.debugPath): if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(result) logging.writeToFile(result)