diff --git a/manageServices/views.py b/manageServices/views.py index 7df91bb98..ddca457b6 100755 --- a/manageServices/views.py +++ b/manageServices/views.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from django.shortcuts import render from django.shortcuts import HttpResponse, redirect import plogical.CyberCPLogFileWriter as logging from loginSystem.views import loadLoginPage @@ -16,44 +15,31 @@ from plogical.processUtilities import ProcessUtilities # Create your views here. def managePowerDNS(request): - try: - userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) + data = {} + data['status'] = 1 - try: + pdnsStatus = PDNSStatus.objects.get(pk=1) - data = {} - data['status'] = 1 + if pdnsStatus.type == 'MASTER': + counter = 1 - pdnsStatus = PDNSStatus.objects.get(pk=1) + for items in SlaveServers.objects.all(): - if pdnsStatus.type == 'MASTER': - counter = 1 - - for items in SlaveServers.objects.all(): - - if counter == 1: - data['slaveServer'] = items.slaveServer - data['slaveServerIP'] = items.slaveServerIP - else: - data['slaveServer%s' % (str(counter))] = items.slaveServer - data['slaveServerIP%s' % (str(counter))] = items.slaveServerIP - - counter = counter + 1 + if counter == 1: + data['slaveServer'] = items.slaveServer + data['slaveServerIP'] = items.slaveServerIP else: - data['slaveServerNS'] = pdnsStatus.masterServer - data['masterServerIP'] = pdnsStatus.masterIP + data['slaveServer%s' % (str(counter))] = items.slaveServer + data['slaveServerIP%s' % (str(counter))] = items.slaveServerIP - proc = httpProc(request, 'manageServices/managePowerDNS.html', - data, 'admin') - return proc.render() + counter = counter + 1 + else: + data['slaveServerNS'] = pdnsStatus.masterServer + data['masterServerIP'] = pdnsStatus.masterIP - except BaseException as msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg)) - return HttpResponse("See CyberCP main log file.") - - except KeyError: - return redirect(loadLoginPage) + proc = httpProc(request, 'manageServices/managePowerDNS.html', + data, 'admin') + return proc.render() def managePostfix(request): proc = httpProc(request, 'manageServices/managePostfix.html', @@ -273,44 +259,33 @@ def saveStatus(request): return HttpResponse(json_data) def manageApplications(request): - try: - userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) + services = [] - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadError() + ## ElasticSearch - services = [] + esPath = '/home/cyberpanel/elasticsearch' + rPath = '/home/cyberpanel/redis' - ## ElasticSearch + if os.path.exists(esPath): + installed = 'Installed' + else: + installed = 'Not-Installed' - esPath = '/home/cyberpanel/elasticsearch' - rPath = '/home/cyberpanel/redis' + if os.path.exists(rPath): + rInstalled = 'Installed' + else: + rInstalled = 'Not-Installed' - if os.path.exists(esPath): - installed = 'Installed' - else: - installed = 'Not-Installed' + elasticSearch = {'image': '/static/manageServices/images/elastic-search.png', 'name': 'Elastic Search', + 'installed': installed} + redis = {'image': '/static/manageServices/images/redis.png', 'name': 'Redis', + 'installed': rInstalled} + services.append(elasticSearch) + services.append(redis) - if os.path.exists(rPath): - rInstalled = 'Installed' - else: - rInstalled = 'Not-Installed' - - elasticSearch = {'image': '/static/manageServices/images/elastic-search.png', 'name': 'Elastic Search', 'installed': installed} - redis = {'image': '/static/manageServices/images/redis.png', 'name': 'Redis', - 'installed': rInstalled} - services.append(elasticSearch) - services.append(redis) - - proc = httpProc(request, 'manageServices/applications.html', - {'services': services}, 'admin') - return proc.render() - - except KeyError: - return redirect(loadLoginPage) + proc = httpProc(request, 'manageServices/applications.html', + {'services': services}, 'admin') + return proc.render() def removeInstall(request): try: