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

bug fix: joomla install following new perm structure

Browse Source
This commit is contained in:
Usman Nasir
2020-02-21 21:26:36 +05:00
parent 794a4f66f9
commit f15619d897
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plogical/applicationInstaller.py
View File

@@ -154,11 +154,15 @@ class ApplicationInstaller(multi.Thread):
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg) + ' [ApplicationInstaller.installWPCLI]') logging.writeToFile(str(msg) + ' [ApplicationInstaller.installWPCLI]')
def dataLossCheck(self, finalPath, tempStatusPath): def dataLossCheck(self, finalPath, externalApp):
return 1
dirFiles = os.listdir(finalPath) command = 'ls -la %s' % (finalPath)
output = ProcessUtilities.outputExecutioner(command, 'nobody').splitlines()
if len(dirFiles) <= 3: logging.writeToFile(str(output))
if len(output) <= 3:
return 1 return 1
else: else:
return 0 return 0
@@ -775,13 +779,17 @@ class ApplicationInstaller(multi.Thread):
FNULL = open(os.devnull, 'w') FNULL = open(os.devnull, 'w')
permPath = '/home/%s/public_html' % (domainName)
command = 'chmod 755 %s' % (permPath)
ProcessUtilities.executioner(command)
if not os.path.exists(finalPath): if not os.path.exists(finalPath):
os.makedirs(finalPath) os.makedirs(finalPath)
## checking for directories/files ## checking for directories/files
if self.dataLossCheck(finalPath, tempStatusPath) == 0: if self.dataLossCheck(finalPath, tempStatusPath) == 0:
return 0 raise BaseException('Directory is not empty.')
## Get Joomla ## Get Joomla
@@ -794,7 +802,7 @@ class ApplicationInstaller(multi.Thread):
statusFile = open(tempStatusPath, 'w') statusFile = open(tempStatusPath, 'w')
statusFile.writelines("File already exists." + " [404]") statusFile.writelines("File already exists." + " [404]")
statusFile.close() statusFile.close()
return 0 raise BaseException('File already exists.')
command = 'unzip ' + finalPath + 'staging.zip -d ' + finalPath command = 'unzip ' + finalPath + 'staging.zip -d ' + finalPath
ProcessUtilities.executioner(command, virtualHostUser) ProcessUtilities.executioner(command, virtualHostUser)
@@ -898,6 +906,10 @@ class ApplicationInstaller(multi.Thread):
installUtilities.reStartLiteSpeedSocket() installUtilities.reStartLiteSpeedSocket()
permPath = '/home/%s/public_html' % (domainName)
command = 'chmod 750 %s' % (permPath)
ProcessUtilities.executioner(command)
statusFile = open(tempStatusPath, 'w') statusFile = open(tempStatusPath, 'w')
statusFile.writelines("Successfully Installed. [200]") statusFile.writelines("Successfully Installed. [200]")
statusFile.close() statusFile.close()
@@ -919,6 +931,10 @@ class ApplicationInstaller(multi.Thread):
except: except:
pass pass
permPath = '/home/%s/public_html' % (domainName)
command = 'chmod 755 %s' % (permPath)
ProcessUtilities.executioner(command)
statusFile = open(tempStatusPath, 'w') statusFile = open(tempStatusPath, 'w')
statusFile.writelines(str(msg) + " [404]") statusFile.writelines(str(msg) + " [404]")
statusFile.close() statusFile.close()