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

merge 2.0.0

Browse Source
This commit is contained in:
Usman Nasir
2020-04-28 05:41:04 +05:00
parent 9bcf437e7d 577e1425cf
commit 98272a85ec
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filemanager/filemanager.py
View File

@@ -420,7 +420,7 @@ class FileManager:
ProcessUtilities.executioner(command, website.externalApp) ProcessUtilities.executioner(command, website.externalApp)
self.changeOwner(self.data['extractionLocation']) self.fixPermissions(domainName)
json_data = json.dumps(finalData) json_data = json.dumps(finalData)
return HttpResponse(json_data) return HttpResponse(json_data)

2
install/installCyberPanel.py
View File

@@ -330,7 +330,6 @@ class InstallCyberPanel:
def installPureFTPD(self): def installPureFTPD(self):
if self.distro == ubuntu: if self.distro == ubuntu:
command = 'DEBIAN_FRONTEND=noninteractive apt install pure-ftpd-mysql -y' command = 'DEBIAN_FRONTEND=noninteractive apt install pure-ftpd-mysql -y'
os.system(command) os.system(command)
@@ -354,7 +353,6 @@ class InstallCyberPanel:
install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
####### Install pureftpd to system startup ####### Install pureftpd to system startup
command = "systemctl enable " + install.preFlightsChecks.pureFTPDServiceName(self.distro) command = "systemctl enable " + install.preFlightsChecks.pureFTPDServiceName(self.distro)

3
plogical/remoteTransferUtilities.py
View File

@@ -193,6 +193,9 @@ class remoteTransferUtilities:
command = "sudo scp -o StrictHostKeyChecking=no -i /root/.ssh/cyberpanel " + completedPathToSend + " root@" + IPAddress + ":/home/backup/transfer-" + folderNumber + "/" command = "sudo scp -o StrictHostKeyChecking=no -i /root/.ssh/cyberpanel " + completedPathToSend + " root@" + IPAddress + ":/home/backup/transfer-" + folderNumber + "/"
subprocess.call(shlex.split(command), stdout=writeToFile) subprocess.call(shlex.split(command), stdout=writeToFile)
if os.path.exists(ProcessUtilities.debugPath):
logging.CyberCPLogFileWriter.writeToFile(command)
os.remove(completedPathToSend) os.remove(completedPathToSend)
except BaseException as msg: except BaseException as msg: