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

bug fix: install and SpamAssassin

Browse Source
This commit is contained in:
Usman Nasir
2019-12-09 21:59:49 +05:00
parent 9c6dffab68
commit b3da16d5cf
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebTerminal/CPWebSocket.py
View File

@@ -79,7 +79,7 @@ class SSHServer(multi.Thread):
else: else:
self.websocket.sendMessage(self.shell.recv(9000).decode("utf-8")) self.websocket.sendMessage(self.shell.recv(9000).decode("utf-8"))
else: else:
time.sleep(0.01) pass
else: else:
return 0 return 0
except BaseException, msg: except BaseException, msg:

17
emailPremium/views.py
View File

@@ -827,12 +827,18 @@ def installStatusSpamAssassin(request):
if installStatus.find("[200]")>-1: if installStatus.find("[200]")>-1:
execPath = "/usr/local/CyberCP/bin/python2 " + virtualHostUtilities.cyberPanel + "/plogical/mailUtilities.py" execPath = "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin && /usr/local/CyberCP/bin/python2 " + virtualHostUtilities.cyberPanel + "/plogical/mailUtilities.py"
execPath = execPath + " configureSpamAssassin" execPath = execPath + " configureSpamAssassin"
output = ProcessUtilities.outputExecutioner(execPath) output = ProcessUtilities.outputExecutioner(execPath)
if output.find("1,None") > -1: if output.find("1,None") > -1:
pass final_json = json.dumps({
'error_message': "None",
'requestStatus': installStatus,
'abort': 1,
'installed': 1,
})
return HttpResponse(final_json)
else: else:
final_json = json.dumps({ final_json = json.dumps({
'error_message': "Failed to install SpamAssassin configurations.", 'error_message': "Failed to install SpamAssassin configurations.",
@@ -842,13 +848,6 @@ def installStatusSpamAssassin(request):
}) })
return HttpResponse(final_json) return HttpResponse(final_json)
final_json = json.dumps({
'error_message': "None",
'requestStatus': installStatus,
'abort':1,
'installed': 1,
})
return HttpResponse(final_json)
elif installStatus.find("[404]") > -1: elif installStatus.find("[404]") > -1:
final_json = json.dumps({ final_json = json.dumps({

4
install/install.py
View File

@@ -2240,8 +2240,8 @@ def main():
checks = preFlightsChecks("/usr/local/lsws/", args.publicip, "/usr/local", cwd, "/usr/local/CyberCP", distro) checks = preFlightsChecks("/usr/local/lsws/", args.publicip, "/usr/local", cwd, "/usr/local/CyberCP", distro)
checks.mountTemp() checks.mountTemp()
if distro == ubuntu: # if distro == ubuntu:
os.chdir("/etc/cyberpanel") # os.chdir("/etc/cyberpanel")
if args.port == None: if args.port == None:
port = "8090" port = "8090"