Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-03-01 09:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

pack config and backup to same snapshot ref https://github.com/rustic-rs/rustic/issues/463

Browse Source
This commit is contained in:
usman@cyberpersons.com
2023-03-06 09:28:51 +05:00
parent 88040beb06
commit a8b7b5d354
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plogical/Backupsv2.py
View File

@@ -336,7 +336,7 @@ pass = {ObsecurePassword}
break
except BaseException as msg:
self.UpdateStatus(f'Failed after config generation, Error: {str(msg)}', CPBackupsV2.FAILED)
self.UpdateStatus(f'Failed, Error: {str(msg)}', CPBackupsV2.FAILED)
return 0
else:
time.sleep(5)
@@ -417,7 +417,12 @@ pass = {ObsecurePassword}
command = f'chown {self.website.externalApp}:{self.website.externalApp} {CurrentDBPath}'
ProcessUtilities.executioner(command)
command = f'rustic -r {self.repo} backup {CurrentDBPath} --password "" --json 2>/dev/null'
## Now pack config into same thing
command = f'chown {self.website.externalApp}:{self.website.externalApp} {self.FinalPathRuctic}/config.json'
ProcessUtilities.executioner(command)
command = f'rustic -r {self.repo} backup {CurrentDBPath} {self.FinalPathRuctic}/config.json --password "" --json 2>/dev/null'
print(f'db command rustic: {command}')
result = json.loads(
ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n'))
@@ -429,7 +434,7 @@ pass = {ObsecurePassword}
### Config is saved with each database, snapshot of config is attached to db snapshot with parent
self.BackupConfig(SnapShotID)
#self.BackupConfig(SnapShotID)
command = f'chown cyberpanel:cyberpanel {self.FinalPathRuctic}'
ProcessUtilities.executioner(command)
@@ -494,11 +499,14 @@ pass = {ObsecurePassword}
source = f'/home/{self.website.domain}'
command = f'chown {self.website.externalApp}:{self.website.externalApp} {self.FinalPathRuctic}/config.json'
ProcessUtilities.executioner(command)
## Pending add user provided folders in the exclude list
exclude = f' --exclude-if-present rusticbackup --exclude-if-present logs '
command = f'rustic -r {self.repo} backup {source} --password "" {exclude} --json 2>/dev/null'
command = f'rustic -r {self.repo} backup {source} {self.FinalPathRuctic}/config.json --password "" {exclude} --json 2>/dev/null'
result = json.loads(ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n'))
try:
@@ -508,7 +516,7 @@ pass = {ObsecurePassword}
### Config is saved with each backup, snapshot of config is attached to data snapshot with parent
self.BackupConfig(SnapShotID)
#self.BackupConfig(SnapShotID)
except BaseException as msg:
self.UpdateStatus(f'Backup failed as no snapshot id found, error: {str(msg)}', CPBackupsV2.FAILED)
@@ -530,6 +538,9 @@ pass = {ObsecurePassword}
command = f'rustic init -r {self.repo} --password ""'
ProcessUtilities.executioner(command, self.website.externalApp)
command = f'chown {self.website.externalApp}:{self.website.externalApp} {self.FinalPathRuctic}/config.json'
ProcessUtilities.executioner(command)
source = f'/home/vmail/{self.website.domain}'
@@ -537,7 +548,7 @@ pass = {ObsecurePassword}
exclude = f' --exclude-if-present rusticbackup --exclude-if-present logs '
command = f'rustic -r {self.repo} backup {source} --password "" {exclude} --json 2>/dev/null'
command = f'rustic -r {self.repo} backup {source} {self.FinalPathRuctic}/config.json --password "" {exclude} --json 2>/dev/null'
result = json.loads(ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n'))
@@ -548,7 +559,7 @@ pass = {ObsecurePassword}
### Config is saved with each email backup, snapshot of config is attached to email snapshot with parent
self.BackupConfig(SnapShotID)
#self.BackupConfig(SnapShotID)
except BaseException as msg:
self.UpdateStatus(f'Backup failed as no snapshot id found, error: {str(msg)}', CPBackupsV2.FAILED)

2
serverStatus/views.py
View File

@@ -455,7 +455,7 @@ def refreshLicense(request):
{'domain': 'cyberpanel.net', 'BasePath': '/home/backup', 'BackupDatabase': 1, 'BackupData': 1,
'BackupEmails': 1, 'BackendName': 'testremote'})
RcloneData = {"name":'testremote', "host":"staging.cyberpanel.net", "user": "abcds2751", "port": "22", "password":"hosting",}
#cpbuv2.SetupRcloneBackend(CPBackupsV2.SFTP, RcloneData)
cpbuv2.SetupRcloneBackend(CPBackupsV2.SFTP, RcloneData)
cpbuv2.InitiateBackup()