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

bug fix: mail domain skip while restore

Browse Source
This commit is contained in:
Usman Nasir
2020-02-09 13:11:26 +05:00
parent 4611c327d6
commit 1c3970aab3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@
.LSOverride .LSOverride
*.pyc *.pyc
.idea .idea
venv

11
plogical/backupUtilities.py
View File

@@ -628,6 +628,16 @@ class backupUtilities:
for childDomain in childDomains: for childDomain in childDomains:
domain = childDomain.find('domain').text domain = childDomain.find('domain').text
## mail domain check
mailDomain = 'mail.%s' % (masterDomain)
if domain == mailDomain:
continue
## Mail domain check
phpSelection = childDomain.find('phpSelection').text phpSelection = childDomain.find('phpSelection').text
path = childDomain.find('path').text path = childDomain.find('path').text
@@ -668,6 +678,7 @@ class backupUtilities:
continue continue
else: else:
logging.CyberCPLogFileWriter.writeToFile('Error domain %s' % (domain))
logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + retValues[1] + ". Not able to create child domains, aborting. [635][5009]") logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + retValues[1] + ". Not able to create child domains, aborting. [635][5009]")
return 0 return 0
except BaseException as msg: except BaseException as msg: