diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index 1ed92fdc1..0686d784e 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -1308,7 +1308,7 @@ Automatic backup failed for %s on %s. BucketName = Scheduleconfig['BucketName'] #####Uploading File - uploadfilename = 'backup-' + websitedomain + "-" + time.strftime("%m.%d.%Y_%H-%M-%S") + uploadfilename = backupConfig['name'] print("uploadfilename....%s"%uploadfilename) try: diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index 6ea2f6e88..3c7ecc1dc 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -2268,6 +2268,7 @@ $parameters = array( BackupDestination = 'Local' SFTP_ID = None + website = wpsite.owner PhpVersion = website.phpSelection VHuser = website.externalApp @@ -2285,7 +2286,7 @@ $parameters = array( command = f'sudo -u {VHuser} {FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_NAME --skip-plugins --skip-themes --path={WPsitepath}' print(command) - retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1) + retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, None, None, None, 1) print(stdoutput) if stdoutput.find('Error:') == -1: @@ -2295,13 +2296,16 @@ $parameters = array( command = f'sudo -u {VHuser} {FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_USER --skip-plugins --skip-themes --path={WPsitepath}' - retStatus, stdoutput = ProcessUtilities.outputExecutioner(command,VHuser, None, None, 1) + retStatus, stdoutput = ProcessUtilities.outputExecutioner(command,None, None, None, 1) if stdoutput.find('Error:') == -1: DataBaseUser = stdoutput.rstrip("\n") else: raise BaseException(stdoutput) + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(f'DB Name: {DataBaseName}') + ### Create secure folder ACLManager.CreateSecureDir() @@ -2324,7 +2328,7 @@ $parameters = array( logging.statusWriter(self.tempStatusPath, 'Creating Backup Directory...,40') command = f"sudo -u {VHuser} mkdir -p {self.tempPath}/public_html" - result, stdout = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1) + result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if result == 0: raise BaseException(stdout) @@ -2366,8 +2370,8 @@ $parameters = array( os.chmod(configPath, 0o600) - command = f"sudo -u {VHuser} cp -R {configPath} {self.tempPath}" - retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1) + command = f"cp -R {configPath} {self.tempPath}" + retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if retStatus == 0: raise BaseException(stdoutput) @@ -2401,10 +2405,15 @@ $parameters = array( logging.statusWriter(self.tempStatusPath, 'Copying database.....,70') - + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(f'DB Name Dump: {DataBaseName}') ##### SQLDUMP database into new directory command = "mysqldump %s --result-file %s/%s.sql" % (DataBaseName, self.tempPath, DataBaseName) + + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(command) + retStatus, result = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if retStatus == 0: @@ -2584,15 +2593,18 @@ $parameters = array( 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}' - retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1) + retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if stdoutput.find('Error:') == -1: DataBaseName = stdoutput.rstrip("\n") else: raise BaseException(stdoutput) + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(f'DB Name: {DataBaseName}') + command = f'{FinalPHPPath} -d error_reporting=0 /usr/bin/wp config get DB_USER --skip-plugins --skip-themes --path={WPsitepath}' - retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, VHuser, None, None, 1) + retStatus, stdoutput = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if stdoutput.find('Error:') == -1: DataBaseUser = stdoutput.rstrip("\n") @@ -2666,9 +2678,16 @@ $parameters = array( logging.statusWriter(self.tempStatusPath, 'Copying DataBase.....,70') + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(f'DB Name MySQL Dump: {DataBaseName}') + ##### SQLDUMP database into new directory command = "mysqldump %s --result-file %s/%s.sql" % (DataBaseName, self.tempPath, DataBaseName) + + if os.path.exists(ProcessUtilities.debugPath): + logging.writeToFile(command) + retStatus, result = ProcessUtilities.outputExecutioner(command, None, None, None, 1) if retStatus == 0: @@ -2775,7 +2794,7 @@ $parameters = array( logging.writeToFile("Downloading start") sftp.get(str(remotepath), str(loaclpath)) - command = "mv %s /home/backup"%loaclpath + command = "mv %s /home/backup/"%loaclpath ProcessUtilities.executioner(command) ##### CHeck if Backup type is Only Database @@ -3834,8 +3853,6 @@ $parameters = array( from plogical.installUtilities import installUtilities installUtilities.reStartLiteSpeed() - - ###S#Backups elif BackupDestination == 'S3': uploadfilename = config['uploadfilename'] @@ -3868,9 +3885,12 @@ $parameters = array( except BaseException as msg: logging.writeToFile("Error in downloadfile: ..%s"%str(msg)) - command = "mv %s /home/backup" % FinalZipPath + + + command = "mv %s /home/backup/" % FinalZipPath ProcessUtilities.executioner(command) + ##### CHeck if Backup type is Only Database if BackupType == 'DataBase Backup': if (DomainName == "" and int(self.extraArgs['DesSiteID']) != -1): @@ -4470,6 +4490,7 @@ $parameters = array( if result == 0: raise BaseException(stdout) + command = "sudo -u %s cp -R %s.[^.]* %s" % (VHuser, unzippath, newWPpath) result, stdout = ProcessUtilities.outputExecutioner(command, None, None, None, 1) @@ -4696,7 +4717,6 @@ $parameters = array( if result == 0: raise BaseException(stdout) - ############## New Site elif (DomainName != "" and int(self.extraArgs['DesSiteID']) == -1): ###############Create New WordPressSite First @@ -4837,6 +4857,7 @@ $parameters = array( if result == 0: raise BaseException(stdout) + logging.statusWriter(self.tempStatusPath, 'Copying Data File...,60') ###Copy backup content to newsite if oldhome == "0":