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

fix backup copy bug

Browse Source
This commit is contained in:
Usman Nasir
2021-03-25 00:10:30 +05:00
parent 1ca5b83122
commit 0de6fd46e0
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cloudAPI/cloudManager.py
View File

@@ -1998,8 +1998,7 @@ class CloudManager:
## Search index ## Search index
command = 'wp option get blog_public --path=%s' % (path) command = 'wp option get blog_public --path=%s' % (path)
finalDic['searchIndex'] = int( finalDic['searchIndex'] = int(ProcessUtilities.outputExecutioner(command, website.externalApp).splitlines()[-1])
ProcessUtilities.outputExecutioner(command, website.externalApp).splitlines()[-1])
## Maintenece mode ## Maintenece mode

26
plogical/backupUtilities.py
View File

@@ -372,7 +372,11 @@ class backupUtilities:
## Stop making archive of document_root and copy instead ## Stop making archive of document_root and copy instead
copy_tree('/home/%s/public_html' % domainName, '%s/%s' % (tempStoragePath, 'public_html')) # copy_tree('/home/%s/public_html' % domainName, '%s/%s' % (tempStoragePath, 'public_html'))
command = 'cp -R /home/%s/public_html %s/public_html' % (domainName, tempStoragePath)
ProcessUtilities.executioner(command)
time.sleep(5)
# make_archive(os.path.join(tempStoragePath,"public_html"), 'gztar', os.path.join("/home",domainName,"public_html")) # make_archive(os.path.join(tempStoragePath,"public_html"), 'gztar', os.path.join("/home",domainName,"public_html"))
@@ -458,7 +462,9 @@ class backupUtilities:
pass pass
if childPath.find('/home/%s/public_html' % domainName) == -1: if childPath.find('/home/%s/public_html' % domainName) == -1:
copy_tree(childPath, '%s/%s-docroot' % (tempStoragePath, actualChildDomain)) # copy_tree(childPath, '%s/%s-docroot' % (tempStoragePath, actualChildDomain))
command = 'cp -R %s %s/%s-docroot' % (childPath, tempStoragePath, actualChildDomain)
ProcessUtilities.executioner(command)
except BaseException as msg: except BaseException as msg:
pass pass
@@ -482,7 +488,9 @@ class backupUtilities:
emailPath = '/home/vmail/%s' % (domainName) emailPath = '/home/vmail/%s' % (domainName)
if os.path.exists(emailPath): if os.path.exists(emailPath):
copy_tree(emailPath, '%s/vmail' % (tempStoragePath), preserve_symlinks=True) # copy_tree(emailPath, '%s/vmail' % (tempStoragePath), preserve_symlinks=True)
command = 'cp -R %s %s/vmail' % (emailPath, tempStoragePath)
ProcessUtilities.executioner(command)
## shutil.make_archive. Creating final package. ## shutil.make_archive. Creating final package.
@@ -789,7 +797,9 @@ class backupUtilities:
if float(version) > 2.0 or float(build) > 0: if float(version) > 2.0 or float(build) > 0:
if path.find('/home/%s/public_html' % masterDomain) == -1: if path.find('/home/%s/public_html' % masterDomain) == -1:
copy_tree('%s/%s-docroot' % (completPath, domain), path) #copy_tree('%s/%s-docroot' % (completPath, domain), path)
command = 'cp -R %s/%s-docroot %s' % (completPath, domain, path)
ProcessUtilities.executioner(command)
continue continue
else: else:
@@ -862,7 +872,9 @@ class backupUtilities:
tar.close() tar.close()
else: else:
if float(version) > 2.0 or float(build) > 0: if float(version) > 2.0 or float(build) > 0:
copy_tree('%s/public_html' % (completPath), websiteHome) #copy_tree('%s/public_html' % (completPath), websiteHome)
command = 'cp -R %s/public_html %s' % (completPath, websiteHome)
ProcessUtilities.executioner(command)
## extracting email accounts ## extracting email accounts
@@ -890,7 +902,9 @@ class backupUtilities:
emailsPath = '%s/vmail' % (completPath) emailsPath = '%s/vmail' % (completPath)
if os.path.exists(emailsPath): if os.path.exists(emailsPath):
copy_tree(emailsPath, '/home/vmail/%s' % (masterDomain)) #copy_tree(emailsPath, '/home/vmail/%s' % (masterDomain))
command = 'cp -R %s /home/vmail/%s' % (emailsPath, masterDomain)
ProcessUtilities.executioner(command)
command = "chown -R vmail:vmail /home/vmail/%s" % (masterDomain) command = "chown -R vmail:vmail /home/vmail/%s" % (masterDomain)
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)