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

improve redis mass hosting

Browse Source
This commit is contained in:
Usman Nasir
2020-02-29 11:36:55 +05:00
parent 900e53db6c
commit e2a3e81fc6
3 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/install.py
View File

@@ -2218,7 +2218,7 @@ vmail
if os.path.exists('%shttpd.conf' % (confPath)):
os.remove('%shttpd.conf' % (confPath))
shutil.copy('litespeed/httpd.conf', confPath)
shutil.copy('litespeed/httpd-redis.conf', confPath)
## start and enable

1
plogical/vhost.py
View File

@@ -15,7 +15,6 @@ from plogical import installUtilities
import subprocess
import shlex
from plogical import CyberCPLogFileWriter as logging
from plogical.mysqlUtilities import mysqlUtilities
from plogical.dnsUtilities import DNS
from random import randint

70
websiteFunctions/website.py
View File

@@ -39,6 +39,7 @@ from plogical.cronUtil import CronUtil
from re import match,I,M
from plogical import randomPassword
from .StagingSetup import StagingSetup
from plogical.vhost import vhost
class WebsiteManager:
@@ -1102,16 +1103,24 @@ class WebsiteManager:
else:
return ACLManager.loadErrorJson('configstatus', 0)
filePath = installUtilities.Server_root_path + "/conf/vhosts/" + self.domain + "/vhost.conf"
command = 'cat %s' % ('/usr/local/lsws/conf/dvhost_redis.conf')
command = 'sudo cat ' + filePath
configData = ProcessUtilities.outputExecutioner(command, 'lsadm')
if ProcessUtilities.outputExecutioner(command).find('127.0.0.1') == -1:
filePath = installUtilities.Server_root_path + "/conf/vhosts/" + self.domain + "/vhost.conf"
if len(configData) == 0:
status = {'status': 0, "configstatus": 0, "error_message": "Configuration file is currently empty!"}
command = 'cat ' + filePath
configData = ProcessUtilities.outputExecutioner(command, 'lsadm')
final_json = json.dumps(status)
return HttpResponse(final_json)
if len(configData) == 0:
status = {'status': 0, "configstatus": 0, "error_message": "Configuration file is currently empty!"}
final_json = json.dumps(status)
return HttpResponse(final_json)
else:
command = 'redis-cli get "vhost:%s"' % (self.domain)
configData = ProcessUtilities.outputExecutioner(command)
configData = '#### This configuration is fetched from redis as Redis-Mass Hosting is being used.\n%s' % (configData)
status = {'status': 1, "configstatus": 1, "configData": configData}
final_json = json.dumps(status)
@@ -1127,38 +1136,51 @@ class WebsiteManager:
configData = data['configData']
self.domain = data['virtualHost']
mailUtilities.checkHome()
command = 'cat %s' % ('/usr/local/lsws/conf/dvhost_redis.conf')
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
if ProcessUtilities.outputExecutioner(command).find('127.0.0.1') == -1:
vhost = open(tempPath, "w")
mailUtilities.checkHome()
vhost.write(configData)
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
vhost.close()
vhost = open(tempPath, "w")
## writing data temporary to file
vhost.write(configData)
filePath = installUtilities.Server_root_path + "/conf/vhosts/" + self.domain + "/vhost.conf"
vhost.close()
## save configuration data
## writing data temporary to file
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py"
execPath = execPath + " saveVHostConfigs --path " + filePath + " --tempPath " + tempPath
filePath = installUtilities.Server_root_path + "/conf/vhosts/" + self.domain + "/vhost.conf"
output = ProcessUtilities.outputExecutioner(execPath)
## save configuration data
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py"
execPath = execPath + " saveVHostConfigs --path " + filePath + " --tempPath " + tempPath
output = ProcessUtilities.outputExecutioner(execPath)
if output.find("1,None") > -1:
status = {"configstatus": 1}
final_json = json.dumps(status)
return HttpResponse(final_json)
else:
data_ret = {'configstatus': 0, 'error_message': output}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
## save configuration data ends
else:
command = "redis-cli set vhost:%s '%s'" % (self.domain, configData.replace('#### This configuration is fetched from redis as Redis-Mass Hosting is being used.\n', ''))
ProcessUtilities.executioner(command)
if output.find("1,None") > -1:
status = {"configstatus": 1}
final_json = json.dumps(status)
return HttpResponse(final_json)
else:
data_ret = {'configstatus': 0, 'error_message': output}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
## save configuration data ends
def getRewriteRules(self, userID=None, data=None):