Skip to content
Permalink
Browse files

bug fix: install and SpamAssassin

  • Loading branch information
usmannasir committed Dec 9, 2019
1 parent 9c6dffa commit b3da16d5cf5bc7d1b95a1682ec35413e00875c62
Showing with 11 additions and 12 deletions.
  1. +1 −1 WebTerminal/CPWebSocket.py
  2. +8 −9 emailPremium/views.py
  3. +2 −2 install/install.py
@@ -79,7 +79,7 @@ def recvData(self):
else:
self.websocket.sendMessage(self.shell.recv(9000).decode("utf-8"))
else:
time.sleep(0.01)
pass
else:
return 0
except BaseException, msg:
@@ -827,12 +827,18 @@ def installStatusSpamAssassin(request):

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"
output = ProcessUtilities.outputExecutioner(execPath)

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:
final_json = json.dumps({
'error_message': "Failed to install SpamAssassin configurations.",
@@ -842,13 +848,6 @@ def installStatusSpamAssassin(request):
})
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:

final_json = json.dumps({
@@ -2240,8 +2240,8 @@ def main():
checks = preFlightsChecks("/usr/local/lsws/", args.publicip, "/usr/local", cwd, "/usr/local/CyberCP", distro)
checks.mountTemp()

if distro == ubuntu:
os.chdir("/etc/cyberpanel")
# if distro == ubuntu:
# os.chdir("/etc/cyberpanel")

if args.port == None:
port = "8090"

0 comments on commit b3da16d

Please sign in to comment.
You can’t perform that action at this time.