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

reuseable code for apache manager

Browse Source
This commit is contained in:
usman@cyberpersons.com
2023-05-17 16:05:58 +05:00
parent b39c453e0d
commit 8820006b99
7 changed files with 64 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApachController/ApacheController.py
View File

@@ -113,15 +113,15 @@ LoadModule mpm_event_module modules/mod_mpm_event.so
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
command = "yum -y install centos-release-scl yum-utils" # command = "yum -y install centos-release-scl yum-utils"
if ProcessUtilities.executioner(command) == 0: # if ProcessUtilities.executioner(command) == 0:
return "Failed to centos-release-scl and yum-utils" # return "Failed to centos-release-scl and yum-utils"
#
# command = "yum-config-manager --enable rhel-server-rhscl-7-rpms"
# if ProcessUtilities.executioner(command) == 0:
# return "Failed to --enable rhel-server-rhscl-7-rpms"
command = "yum-config-manager --enable rhel-server-rhscl-7-rpms" sslPath = "/etc/httpd/conf.d/ssl.conf"
if ProcessUtilities.executioner(command) == 0:
return "Failed to --enable rhel-server-rhscl-7-rpms"
sslPath = "/etc/apache2/conf.d/ssl.conf"
if os.path.exists(sslPath): if os.path.exists(sslPath):
os.remove(sslPath) os.remove(sslPath)
@@ -155,8 +155,6 @@ LoadModule mpm_event_module modules/mod_mpm_event.so
else: else:
sslPath = "/etc/httpd/conf.d/ssl.conf"
confPath = ApacheVhost.serverRootPath + "/apache2.conf" confPath = ApacheVhost.serverRootPath + "/apache2.conf"
portsPath = '/etc/apache2/ports.conf' portsPath = '/etc/apache2/ports.conf'

38
ApachController/ApacheVhosts.py
View File

@@ -554,10 +554,7 @@ class ApacheVhost:
confFile.write(currentConf) confFile.write(currentConf)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl stop {phpService}" command = f"systemctl stop {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
@@ -572,3 +569,36 @@ class ApacheVhost:
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg)) logging.writeToFile(str(msg))
return 1 return 1
@staticmethod
def DecidePHPPathforManager(apache, phpVers):
if apache == None:
phpVers = "php" + PHPManager.getPHPString(phpVers)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
path = "/usr/local/lsws/ls" + phpVers + "/etc/php.ini"
else:
initial = phpVers[3]
final = phpVers[4]
completeName = str(initial) + '.' + str(final)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php/" + completeName + "/litespeed/php.ini"
else:
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
phpVers = "php" + PHPManager.getPHPString(phpVers)
path = f'/etc/opt/remi/{phpVers}/php.ini'
else:
path = f'/etc/php/{phpVers.split(" ")[1]}/fpm/php.ini'
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f'PHP Path {path}')
return path
@staticmethod
def DecideFPMServiceName(phpVersion):
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
php = PHPManager.getPHPString(phpVersion)
return f'php{php}-php-fpm'
else:
return f"{phpVersion.replace(' ', '').lower()}-fpm"

56
managePHP/views.py
View File

@@ -1698,20 +1698,8 @@ def getCurrentPHPConfig(request):
if os.path.exists(ProcessUtilities.debugPath): if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f"apache value {request.GET.get('apache', None)}") logging.writeToFile(f"apache value {request.GET.get('apache', None)}")
if request.GET.get('apache', None) == None: from ApachController.ApacheVhosts import ApacheVhost
phpVers = "php" + PHPManager.getPHPString(phpVers) path = ApacheVhost.DecidePHPPathforManager(request.GET.get('apache', None), phpVers)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
path = "/usr/local/lsws/ls" + phpVers + "/etc/php.ini"
else:
initial = phpVers[3]
final = phpVers[4]
completeName = str(initial) + '.' + str(final)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php/" + completeName + "/litespeed/php.ini"
else:
path = f'/etc/php/{phpVers.split(" ")[1]}/fpm/php.ini'
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f'PHP Path {path}')
allow_url_fopen = "0" allow_url_fopen = "0"
display_errors = "0" display_errors = "0"
@@ -1820,7 +1808,7 @@ def savePHPConfigBasic(request):
else: else:
allow_url_include = "allow_url_include = Off" allow_url_include = "allow_url_include = Off"
phpVers = "php" + PHPManager.getPHPString(phpVers) #phpVers = "php" + PHPManager.getPHPString(phpVers)
if request.GET.get('apache', None) == None: if request.GET.get('apache', None) == None:
apache = 0 apache = 0
@@ -1830,7 +1818,7 @@ def savePHPConfigBasic(request):
## ##
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/phpUtilities.py" execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/phpUtilities.py"
execPath = execPath + " savePHPConfigBasic --phpVers " + phpVers + " --allow_url_fopen '" + allow_url_fopen +\ execPath = execPath + " savePHPConfigBasic --phpVers '" + phpVers + "' --allow_url_fopen '" + allow_url_fopen +\
"' --display_errors '" + display_errors + "' --file_uploads '" + file_uploads + "' --allow_url_include '" \ "' --display_errors '" + display_errors + "' --file_uploads '" + file_uploads + "' --allow_url_include '" \
+ allow_url_include + "' --memory_limit " + memory_limit + " --max_execution_time " + \ + allow_url_include + "' --memory_limit " + memory_limit + " --max_execution_time " + \
max_execution_time + " --upload_max_filesize " + upload_max_filesize \ max_execution_time + " --upload_max_filesize " + upload_max_filesize \
@@ -1875,24 +1863,8 @@ def getCurrentAdvancedPHPConfig(request):
if os.path.exists(ProcessUtilities.debugPath): if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f"apache value advanced config {request.GET.get('apache', None)}") logging.writeToFile(f"apache value advanced config {request.GET.get('apache', None)}")
phpVersSApache = phpVers from ApachController.ApacheVhosts import ApacheVhost
path = ApacheVhost.DecidePHPPathforManager(request.GET.get('apache', None), phpVers)
if request.GET.get('apache', None) == None:
phpVers = "php" + PHPManager.getPHPString(phpVers)
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f"value of phpvers in ls {phpVers}")
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
path = "/usr/local/lsws/ls" + phpVers + "/etc/php.ini"
else:
initial = phpVers[3]
final = phpVers[4]
completeName = str(initial) + '.' + str(final)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php/" + completeName + "/litespeed/php.ini"
else:
path = f'/etc/php/{phpVersSApache.split(" ")[1]}/fpm/php.ini'
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f'PHP Path {path}')
command = "sudo cat " + path command = "sudo cat " + path
configData = ProcessUtilities.outputExecutioner(command) configData = ProcessUtilities.outputExecutioner(command)
@@ -1926,20 +1898,8 @@ def savePHPConfigAdvance(request):
phpVers = data['phpSelection'] phpVers = data['phpSelection']
phpVersS = phpVers phpVersS = phpVers
if request.GET.get('apache', None) == None: from ApachController.ApacheVhosts import ApacheVhost
phpVers = "php" + PHPManager.getPHPString(phpVers) path = ApacheVhost.DecidePHPPathforManager(request.GET.get('apache', None), phpVers)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
path = "/usr/local/lsws/ls" + phpVers + "/etc/php.ini"
else:
initial = phpVers[3]
final = phpVers[4]
completeName = str(initial) + '.' + str(final)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php/" + completeName + "/litespeed/php.ini"
else:
path = f'/etc/php/{phpVersS.split(" ")[1]}/fpm/php.ini'
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(f'PHP Path {path}')
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999)) tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))

20
plogical/phpUtilities.py
View File

@@ -108,19 +108,8 @@ class phpUtilities:
command = 'touch %s' % (serverLevelPHPRestart) command = 'touch %s' % (serverLevelPHPRestart)
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
if int(apache) == 0: from ApachController.ApacheVhosts import ApacheVhost
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: path = ApacheVhost.DecidePHPPathforManager(int(apache), phpVers)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php.ini"
else:
initial = phpVers[3]
final = phpVers[4]
completeName = str(initial) + '.' + str(final)
path = "/usr/local/lsws/ls" + phpVers + "/etc/php/" + completeName + "/litespeed/php.ini"
else:
path = f'/etc/php/{phpVers[3]}.{phpVers[4]}/fpm/php.ini'
logging.CyberCPLogFileWriter.writeToFile(path)
data = open(path, 'r').readlines() data = open(path, 'r').readlines()
@@ -159,10 +148,7 @@ class phpUtilities:
if int(apache) == 1: if int(apache) == 1:
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVers)
phpService = f'php{phpVers}-php-fpm'
else:
phpService = f"php{phpVers[3]}.{phpVers[4]}-fpm"
command = f"systemctl restart {phpService}" command = f"systemctl restart {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)

5
plogical/vhost.py
View File

@@ -667,10 +667,7 @@ class vhost:
php = PHPManager.getPHPString(phpVersion) php = PHPManager.getPHPString(phpVersion)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl restart {phpService}" command = f"systemctl restart {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)

20
plogical/virtualHostUtilities.py
View File

@@ -245,10 +245,7 @@ class virtualHostUtilities:
installUtilities.installUtilities.reStartLiteSpeed() installUtilities.installUtilities.reStartLiteSpeed()
php = PHPManager.getPHPString(phpVersion) php = PHPManager.getPHPString(phpVersion)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl restart {phpService}" command = f"systemctl restart {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
@@ -1124,10 +1121,7 @@ class virtualHostUtilities:
installUtilities.installUtilities.reStartLiteSpeed() installUtilities.installUtilities.reStartLiteSpeed()
php = PHPManager.getPHPString(phpVersion) php = PHPManager.getPHPString(phpVersion)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl restart {phpService}" command = f"systemctl restart {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
@@ -1221,10 +1215,12 @@ class virtualHostUtilities:
## ##
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else: # if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm" # phpService = f'php{php}-php-fpm'
# else:
# phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl stop {phpService}" command = f"systemctl stop {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)

5
websiteFunctions/website.py
View File

@@ -4647,10 +4647,7 @@ StrictHostKeyChecking no
php = PHPManager.getPHPString(phpVersion) php = PHPManager.getPHPString(phpVersion)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpService = ApacheVhost.DecideFPMServiceName(phpVersion)
phpService = f'php{php}-php-fpm'
else:
phpService = f"{phpVersion.replace(' ', '').lower()}-fpm"
command = f"systemctl stop {phpService}" command = f"systemctl stop {phpService}"
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)