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

bug fix in exclude

Browse Source
This commit is contained in:
usman@cyberpersons.com
2023-04-14 16:39:44 +05:00
parent a4e65cd6df
commit f4ba445750
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
IncBackups/views.py
View File

@@ -721,7 +721,6 @@ def ConfigureV2Backup(request):
if ACLManager.currentContextPermission(current_acl, 'createBackup') == 0: if ACLManager.currentContextPermission(current_acl, 'createBackup') == 0:
return ACLManager.loadError() return ACLManager.loadError()
if ACLManager.CheckForPremFeature('all'): if ACLManager.CheckForPremFeature('all'):
BackupStat = 1 BackupStat = 1
else: else:
@@ -1029,9 +1028,6 @@ def selectwebsiteCreatev2(request):
return HttpResponse(final_json) return HttpResponse(final_json)
# logging.writeToFile(str(CurrentContent)) # logging.writeToFile(str(CurrentContent))
# final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'error_message': "None", "data": None}) # final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'error_message': "None", "data": None})
# return HttpResponse(final_json) # return HttpResponse(final_json)

1
dockerManager/container.py
View File

@@ -137,6 +137,7 @@ class ContainerManager(multi.Thread):
client = docker.from_env() client = docker.from_env()
dockerAPI = docker.APIClient() dockerAPI = docker.APIClient()
try: try:
container = client.containers.get(name) container = client.containers.get(name)
except docker.errors.NotFound as err: except docker.errors.NotFound as err:

2
plogical/Backupsv2.py
View File

@@ -634,7 +634,7 @@ team_drive =
## Pending add user provided folders in the exclude list ## Pending add user provided folders in the exclude list
exclude = f' --exclude-if-present rusticbackup --exclude-if-present logs ' exclude = f' --exclude-if-present {source}/logs '
command = f'rustic -r {self.repo} backup {source} --password "" {exclude} --json 2>/dev/null' command = f'rustic -r {self.repo} backup {source} --password "" {exclude} --json 2>/dev/null'
result = json.loads(ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n')) result = json.loads(ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n'))