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

redis conf

Browse Source
This commit is contained in:
Usman Nasir
2020-01-11 19:27:49 +05:00
parent ff840fb7bb
commit 7b07486398
3 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
install/install.py
View File

@@ -2182,6 +2182,23 @@ service_port = 9000
command = 'dnf install redis -y'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
## install redis conf
redisConf = '/usr/local/lsws/conf/dvhost_redis.conf'
writeToFile = open(redisConf, 'w')
writeToFile.write('127.0.0.1,6379,<auth_password>\n')
writeToFile.close()
confPath = '/usr/local/lsws/conf/'
if os.path.exists('%shttpd.conf' % (confPath)):
os.remove('%shttpd.conf' % (confPath))
shutil.copy('litespeed/httpd.conf', confPath)
## start and enable
command = 'systemctl start redis'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)

45
plogical/vhost.py
View File

@@ -35,6 +35,7 @@ class vhost:
Server_root = "/usr/local/lsws"
cyberPanel = "/usr/local/CyberCP"
redisConf = '/usr/local/lsws/conf/dvhost_redis.conf'
@staticmethod
def addUser(virtualHostUser, path):
@@ -239,19 +240,21 @@ class vhost:
return 1
else:
try:
confFile = open(vhFile, "w+")
php = PHPManager.getPHPString(phpVersion)
currentConf = vhostConfs.lswsMasterConf
if not os.path.exists(vhost.redisConf):
confFile = open(vhFile, "w+")
php = PHPManager.getPHPString(phpVersion)
currentConf = currentConf.replace('{virtualHostName}', virtualHostName)
currentConf = currentConf.replace('{administratorEmail}', administratorEmail)
currentConf = currentConf.replace('{externalApp}', virtualHostUser)
currentConf = currentConf.replace('{php}', php)
currentConf = vhostConfs.lswsMasterConf
confFile.write(currentConf)
currentConf = currentConf.replace('{virtualHostName}', virtualHostName)
currentConf = currentConf.replace('{administratorEmail}', administratorEmail)
currentConf = currentConf.replace('{externalApp}', virtualHostUser)
currentConf = currentConf.replace('{php}', php)
confFile.close()
confFile.write(currentConf)
confFile.close()
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(
str(msg) + " [IO Error with per host config file [perHostVirtualConf]]")
@@ -808,21 +811,23 @@ class vhost:
else:
try:
confFile = open(vhFile, "w+")
php = PHPManager.getPHPString(phpVersion)
if not os.path.exists(vhost.redisConf):
currentConf = vhostConfs.lswsChildConf
confFile = open(vhFile, "w+")
php = PHPManager.getPHPString(phpVersion)
currentConf = currentConf.replace('{virtualHostName}', domain)
currentConf = currentConf.replace('{masterDomain}', masterDomain)
currentConf = currentConf.replace('{administratorEmail}', administratorEmail)
currentConf = currentConf.replace('{externalApp}', virtualHostUser)
currentConf = currentConf.replace('{path}', path)
currentConf = currentConf.replace('{php}', php)
currentConf = vhostConfs.lswsChildConf
confFile.write(currentConf)
currentConf = currentConf.replace('{virtualHostName}', domain)
currentConf = currentConf.replace('{masterDomain}', masterDomain)
currentConf = currentConf.replace('{administratorEmail}', administratorEmail)
currentConf = currentConf.replace('{externalApp}', virtualHostUser)
currentConf = currentConf.replace('{path}', path)
currentConf = currentConf.replace('{php}', php)
confFile.close()
confFile.write(currentConf)
confFile.close()
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(
str(msg) + " [IO Error with per host config file [perHostDomainConf]]")

30
plogical/virtualHostUtilities.py
View File

@@ -52,6 +52,7 @@ class virtualHostUtilities:
Server_root = "/usr/local/lsws"
cyberPanel = "/usr/local/CyberCP"
redisConf = '/usr/local/lsws/conf/dvhost_redis.conf'
@staticmethod
def createVirtualHost(virtualHostName, administratorEmail, phpVersion, virtualHostUser, ssl,
@@ -123,9 +124,10 @@ class virtualHostUtilities:
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Creating configurations..,50')
retValues = vhost.createConfigInMainVirtualHostFile(virtualHostName)
if retValues[0] == 0:
raise BaseException(retValues[1])
if not os.path.exists(virtualHostUtilities.redisConf):
retValues = vhost.createConfigInMainVirtualHostFile(virtualHostName)
if retValues[0] == 0:
raise BaseException(retValues[1])
selectedPackage = Package.objects.get(packageName=packageName)
@@ -138,15 +140,18 @@ class virtualHostUtilities:
if ssl == 1:
sslPath = "/home/" + virtualHostName + "/public_html"
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Setting up SSL..,70')
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
retValues = sslUtilities.issueSSLForDomain(virtualHostName, administratorEmail, sslPath)
if retValues[0] == 0:
raise BaseException(retValues[1])
else:
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
if ssl == 0:
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
vhost.finalizeVhostCreation(virtualHostName, virtualHostUser)
@@ -1072,8 +1077,8 @@ class virtualHostUtilities:
master.adminEmail, master.externalApp, openBasedir)
if retValues[0] == 0:
raise BaseException(retValues[1])
retValues = vhost.createConfigInMainDomainHostFile(virtualHostName, masterDomain)
if not os.path.exists(virtualHostUtilities.redisConf):
retValues = vhost.createConfigInMainDomainHostFile(virtualHostName, masterDomain)
if retValues[0] == 0:
raise BaseException(retValues[1])
@@ -1085,15 +1090,18 @@ class virtualHostUtilities:
if ssl == 1:
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Creating SSL..,50')
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
retValues = sslUtilities.issueSSLForDomain(virtualHostName, master.adminEmail, path)
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
if retValues[0] == 0:
raise BaseException(retValues[1])
## Final Restart
if ssl == 0:
installUtilities.installUtilities.reStartLiteSpeed()
if not os.path.exists(virtualHostUtilities.redisConf):
installUtilities.installUtilities.reStartLiteSpeed()
vhost.finalizeDomainCreation(master.externalApp, path)