From 3f3b758730cccfd33d1b48687d00525ec27a2469 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Thu, 14 Dec 2017 07:02:02 -0500 Subject: [PATCH] Joomla Installer minor fixes --- plogical/virtualHostUtilities.py | 5 ----- websiteFunctions/views.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index 22a9be385..f3430ad13 100644 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -1393,9 +1393,6 @@ RewriteRule .* - [E=cache-control:max-age=120] installUtilities.installUtilities.reStartLiteSpeed() - print "1,None" - - except BaseException, msg: # remove the downloaded files try: @@ -1411,8 +1408,6 @@ RewriteRule .* - [E=cache-control:max-age=120] command = "chown -R "+virtualHostUser+":"+virtualHostUser+" " + homeDir cmd = shlex.split(command) res = subprocess.call(cmd,stdout=FNULL, stderr=subprocess.STDOUT) - - print "0," + str(msg) return def issueSSLForHostName(virtualHost,path): diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index cc04d2197..681aa0c5d 100644 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -1294,7 +1294,7 @@ def installJoomla(request): except KeyError, msg: status = {"installStatus":0,"error":str(msg)} - logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[installWordpress]") + logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[installJoomla]") return HttpResponse("Not Logged in as admin")