From e4da5582ca737a5a8fce4622d13335b3be86de12 Mon Sep 17 00:00:00 2001 From: WhatTheServer Date: Thu, 24 Dec 2020 19:52:21 -0500 Subject: [PATCH] Update cyberPanel.py Setup cyberpanel cli createBackup to where it can accept an optional argument for the backup path so scripting full backups to other paths can be done easily. --- cli/cyberPanel.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cli/cyberPanel.py b/cli/cyberPanel.py index ffe62b031..939f0b7e5 100755 --- a/cli/cyberPanel.py +++ b/cli/cyberPanel.py @@ -333,13 +333,22 @@ class cyberPanel: ## Backup Functions - def createBackup(self, virtualHostName): + def createBackup(self, virtualHostName, backupPath=None): try: - backupLogPath = "/usr/local/lscp/logs/backup_log."+time.strftime("%m.%d.%Y_%H-%M-%S") + # Setup default backup path to /home//backup if not passed in + if backupPath is None: + backupPath = '/home/' + virtualHostName + '/backup' + + # remove trailing slash in path + backupPath = backupPath.rstrip("/") + backuptime = time.strftime("%m.%d.%Y_%H-%M-%S") + backupLogPath = "/usr/local/lscp/logs/backup_log." + backuptime print('Backup logs to be generated in %s' % (backupLogPath)) - - backupSchedule.createLocalBackup(virtualHostName, backupLogPath) + tempStoragePath = backupPath + '/backup-' + virtualHostName + '-' + backuptime + backupName = 'backup-' + virtualHostName + '-' + backuptime + backupDomain = virtualHostName + backupUtilities.submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain) except BaseException as msg: logger.writeforCLI(str(msg), "Error", stack()[0][3])