mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix: apache manager and resolve some ports conflicts

This commit is contained in:
usman@cyberpersons.com 2023-05-17 19:19:30 +05:00
parent 08ce5b6276
commit ebc70fdf6d
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApachController/ApacheController.py
View File

@ -128,17 +128,22 @@ LoadModule mpm_event_module modules/mod_mpm_event.so
confPath = ApacheVhost.serverRootPath + "/conf/httpd.conf"
CurrentConf = open(confPath, 'r').read()
data = open(confPath, 'r').readlines()
writeToFile = open(confPath, 'w')
for items in data:
if items.find("Listen") > -1 and items.find("80") > -1 and items.find('#') == -1:
writeToFile.writelines("Listen 8081\nListen 8082\n")
if CurrentConf.find('Listen 8083') ==-1:
writeToFile.writelines("Listen 8083\nListen 8082\n")
elif items.find("User") > -1 and items.find('#') == -1:
writeToFile.writelines("User nobody\n")
if CurrentConf.find('User nobody') == -1:
writeToFile.writelines("User nobody\n")
elif items.find("Group") > -1 and items.find('#') == -1:
writeToFile.writelines("Group nobody\n")
writeToFile.writelines('SetEnv LSWS_EDITION Openlitespeed\nSetEnv X-LSCACHE on\n')
if CurrentConf.find('Group nobody') == -1:
writeToFile.writelines("Group nobody\n")
writeToFile.writelines('SetEnv LSWS_EDITION Openlitespeed\nSetEnv X-LSCACHE on\n')
elif items[0] == "#":
continue
else:
@ -160,7 +165,7 @@ LoadModule mpm_event_module modules/mod_mpm_event.so
portsPath = '/etc/apache2/ports.conf'
WriteToFile = open(portsPath, 'w')
WriteToFile.write('Listen 8081\nListen 8082\n')
WriteToFile.write('Listen 8083\nListen 8082\n')
WriteToFile.close()

5
managePHP/views.py
View File

@ -1298,7 +1298,10 @@ def getExtensionsInformation(request):
if request.GET.get('apache', None) == None:
phpVers = f"lsphp{PHPManager.getPHPString(phpVers)}"
else:
phpVers = phpVers.replace(' ', '').lower()
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
phpVers = f"php{PHPManager.getPHPString(phpVers)}"
else:
phpVers = phpVers.replace(' ', '').lower()
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f'PHP Version apache {phpVers}')

6
plogical/vhostConfs.py
View File

@ -213,7 +213,7 @@ context /.well-known/acme-challenge {
</VirtualHost>"""
apacheConf = """<VirtualHost *:8081>
apacheConf = """<VirtualHost *:8082>
ServerName {virtualHostName}
ServerAlias www.{virtualHostName}
@ -269,7 +269,7 @@ context /.well-known/acme-challenge {
</VirtualHost>
"""
apacheConfChild = """<VirtualHost *:8081>
apacheConfChild = """<VirtualHost *:8083>
ServerName {virtualHostName}
ServerAlias www.{virtualHostName}
@ -325,7 +325,7 @@ context /.well-known/acme-challenge {
"""
proxyApacheBackend = """extprocessor apachebackend {
type proxy
address http://127.0.0.1:8081
address http://127.0.0.1:8083
maxConns 100
pcKeepAliveTimeout 60
initTimeout 60