Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-16 10:35:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature: remove duplicatte compression for emails

Browse Source
This commit is contained in:
Usman Nasir
2020-04-07 13:31:23 +05:00
parent 0e04d77b74
commit 4b503008bc
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
plogical/backupUtilities.py
View File

@@ -471,11 +471,10 @@ class backupUtilities:
logging.CyberCPLogFileWriter.statusWriter(status, "Backing up email accounts..\n")
try:
make_archive(os.path.join(tempStoragePath, domainName), 'gztar', os.path.join("/home", "vmail", domainName))
except BaseException as msg:
pass
emailPath = '/home/vmail/%s' % (domainName)
if os.path.exists(emailPath):
copy_tree(emailPath, '%s/vmail' % (tempStoragePath))
## shutil.make_archive. Creating final package.
@@ -862,21 +861,32 @@ class backupUtilities:
logging.CyberCPLogFileWriter.statusWriter(status, "Extracting email accounts!")
try:
pathToCompressedEmails = os.path.join(completPath, masterDomain + ".tar.gz")
emailHome = os.path.join("/home","vmail",masterDomain)
if not twoPointO:
tar = tarfile.open(pathToCompressedEmails)
tar.extractall(emailHome)
tar.close()
try:
pathToCompressedEmails = os.path.join(completPath, masterDomain + ".tar.gz")
emailHome = os.path.join("/home","vmail",masterDomain)
## Change permissions
tar = tarfile.open(pathToCompressedEmails)
tar.extractall(emailHome)
tar.close()
command = "chmod -r vmail:vmail " + emailHome
subprocess.call(shlex.split(command))
## Change permissions
except:
pass
command = "chown -R vmail:vmail " + emailHome
subprocess.call(shlex.split(command))
except:
pass
else:
emailsPath = '%s/vmail' % (completPath)
if os.path.exists(emailsPath):
copy_tree(emailsPath, '/home/vmail/%s' % (masterDomain))
command = "chown -R vmail:vmail /home/vmail/%s" % (masterDomain)
ProcessUtilities.executioner(command)
## emails extracted