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

Include Domain Aliases to Backups.

Browse Source
This commit is contained in:
usmannasir
2018-05-09 23:10:57 +05:00
parent 9571f0a666
commit 8d8da9fcb9
4 changed files with 105 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backup/views.py
View File

@@ -254,6 +254,23 @@ def submitBackupCreation(request):
metaFileXML.append(databasesXML)
## Get Aliases
aliasesXML = Element('Aliases')
aliases = backupUtil.backupUtilities.getAliases(backupDomain)
for items in aliases:
child = SubElement(aliasesXML, 'alias')
child.text = items
metaFileXML.append(aliasesXML)
## Finish Alias
## DNS Records XML
try:

4
install/install.py
View File

@@ -703,7 +703,7 @@ class preFlightsChecks:
count = 0
while (1):
command = "wget http://cyberpanel.net/CyberPanel.1.6.3.tar.gz"
command = "wget http://cyberpanel.net/CyberPanel.1.6.4.tar.gz"
#command = "wget http://cyberpanel.net/CyberPanelTemp.tar.gz"
res = subprocess.call(shlex.split(command))
@@ -723,7 +723,7 @@ class preFlightsChecks:
count = 0
while(1):
command = "tar zxf CyberPanel.1.6.3.tar.gz"
command = "tar zxf CyberPanel.1.6.4.tar.gz"
#command = "tar zxf CyberPanelTemp.tar.gz"
res = subprocess.call(shlex.split(command))

84
plogical/backupUtilities.py
View File

@@ -16,9 +16,13 @@ from shutil import move,copy
import sys
from xml.etree import ElementTree
import time
from virtualHostUtilities import virtualHostUtilities, createAlias
from sslUtilities import sslUtilities
## I am not the monster that you think I am..
class backupUtilities:
completeKeyPath = "/home/cyberpanel/.ssh"
@@ -80,10 +84,25 @@ class backupUtilities:
if mysqlUtilities.mysqlUtilities.createDatabaseBackup(dbName, tempStoragePath) == 0:
raise BaseException
try:
pathToStoreSSL = sslUtilities.Server_root + "/conf/vhosts/" + "SSL-" + domainName
if os.path.exists(pathToStoreSSL):
pathToStoreSSLPrivKey = pathToStoreSSL + "/privkey.pem"
pathToStoreSSLFullChain = pathToStoreSSL + "/fullchain.pem"
copy(pathToStoreSSLPrivKey, tempStoragePath + "/privkey.pem")
copy(pathToStoreSSLFullChain, tempStoragePath + "/fullchain.pem")
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startBackup]")
## shutil.make_archive, ## shutil.
make_archive(os.path.join(backupPath,backupName), 'gztar', tempStoragePath)
rmtree(tempStoragePath)
## Saving SSL Certificates if any
status = open(os.path.join(backupPath,'status'), "w")
status.write("Completed\n")
status.close()
@@ -92,7 +111,6 @@ class backupUtilities:
except BaseException,msg:
try:
os.remove(os.path.join(backupPath,backupName+".tar.gz"))
except:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startBackup]")
@@ -162,7 +180,7 @@ class backupUtilities:
status.write("Creating Accounts,Databases and DNS records!")
status.close()
## creating website and its dabases
########### Creating website and its dabases
try:
finalData = json.dumps({'backupFile': backupName,"dir":dir})
@@ -173,17 +191,17 @@ class backupUtilities:
pass
else:
status = open(os.path.join(completPath,'status'), "w")
status.write("Error Message: " + data['error_message'] +". Not able to create Account, Databasesand DNS Records, aborting. [5009]")
status.write("Error Message: " + data['error_message'] +". Not able to create Account, Databases and DNS Records, aborting. [5009]")
status.close()
return 0
except BaseException,msg:
status = open(os.path.join(completPath,'status'), "w")
status.write("Error Message: " + str(msg) +". Not able to create Account, Databasesand DNS Records, aborting. [5009]")
status.write("Error Message: " + str(msg) +". Not able to create Account, Databases and DNS Records, aborting. [5009]")
status.close()
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
return 0
########### creating child/sub/addon/parked domains
###########Ccreating child/sub/addon/parked domains
status = open(os.path.join(completPath,'status'), "w")
status.write("Creating Child Domains!")
@@ -200,6 +218,21 @@ class backupUtilities:
childDomains = backupMetaData.findall('ChildDomains/domain')
## Let us try to restore SSL.
if os.path.exists(completPath + "/privkey.pem"):
sslUtilities.installSSLForDomain(masterDomain)
pathToStoreSSL = sslUtilities.Server_root + "/conf/vhosts/" + "SSL-" + masterDomain
pathToStoreSSLPrivKey = pathToStoreSSL + "/privkey.pem"
pathToStoreSSLFullChain = pathToStoreSSL + "/fullchain.pem"
copy(completPath + "/privkey.pem", pathToStoreSSLPrivKey)
copy(completPath + "/fullchain.pem", pathToStoreSSLFullChain)
command = "chown " + "lsadm" + ":" + "lsadm" + " " + pathToStoreSSL
cmd = shlex.split(command)
try:
for childDomain in childDomains:
@@ -210,7 +243,8 @@ class backupUtilities:
finalData = json.dumps(
{'masterDomain': masterDomain, 'domainName': domain, 'phpSelection': phpSelection,
'path': path,
'ssl': 0, 'restore': 1})
'ssl': 0, 'restore': 1,
'dkimCheck': 0})
r = requests.post("http://localhost:5003/websites/submitDomainCreation", data=finalData,
verify=False)
@@ -239,6 +273,14 @@ class backupUtilities:
status.write("Restoring email accounts!")
status.close()
## Restore Aliases
aliases = backupMetaData.findall('Aliases/alias')
for items in aliases:
createAlias(masterDomain, items.text, 0, "", "")
emailAccounts = backupMetaData.findall('emails/emailAccount')
try:
@@ -290,6 +332,10 @@ class backupUtilities:
## Databases restored
## Restoring Aliases
aliases = backupMetaData.findall('Databases/database')
status = open(os.path.join(completPath, 'status'), "w")
status.write("Extracting web home data!")
status.close()
@@ -307,7 +353,6 @@ class backupUtilities:
status.close()
try:
pathToCompressedEmails = os.path.join(completPath, masterDomain + ".tar.gz")
emailHome = os.path.join("/home","vmail",masterDomain)
@@ -567,6 +612,31 @@ class backupUtilities:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [host_key_verification]")
return 0
@staticmethod
def getAliases(masterDomain):
try:
confPath = os.path.join(virtualHostUtilities.Server_root, "conf/httpd_config.conf")
command = "sudo cat " + confPath
data = subprocess.check_output(shlex.split(command)).splitlines()
aliases = []
for items in data:
if items.find(masterDomain) > -1 and items.find('map') > -1:
data = filter(None, items.split(" "))
if data[1] == masterDomain:
length = len(data)
for i in range(3, length):
currentAlias = data[i].rstrip(',').strip('\n')
aliases.append(currentAlias)
return aliases
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [getAliases]")
print 0
def submitBackupCreation(tempStoragePath,backupName,backupPath,metaPath):
try:

9
plogical/virtualHostUtilities.py
View File

@@ -971,6 +971,10 @@ def createVirtualHost(virtualHostName,administratorEmail,phpVersion,virtualHostU
print "0,Virtual Host Directory already exists!"
return
if virtualHostUtilities.checkIfAliasExists(virtualHostName) == 1:
print "0,This domain exists as Alias."
return
if dkimCheck == 1:
if mailUtilities.checkIfDKIMInstalled() == 0:
print "0, OpenDKIM is not installed, install OpenDKIM from DKIM Manager."
@@ -1032,6 +1036,11 @@ def createDomain(masterDomain, virtualHostName, phpVersion, path,administratorEm
return
if virtualHostUtilities.checkIfAliasExists(virtualHostName) == 1:
print "0,This domain exists as Alias."
return
if dkimCheck == 1:
if mailUtilities.checkIfDKIMInstalled() == 0:
print "0, OpenDKIM is not installed, install OpenDKIM from DKIM Manager."