Skip to content

Commit ca1d507

Browse files
usmannasirusmannasir
committed
bug fix: #346 
1 parent d71b304 commit ca1d507

File tree

3 files changed

+42
-19
lines changed

3 files changed

+42
-19
lines changed

‎manageServices/serviceManager.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def managePDNS(self):
3030
ipsString = ipsString.rstrip(' ')
3131
ipStringNoSubnet = ipStringNoSubnet.rstrip(' ')
3232

33-
34-
33+
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
34+
writeToFile = open(tempPath, 'w')
3535

3636
for items in data:
3737
if items.find('allow-axfr-ips') > -1:
@@ -49,14 +49,14 @@ def managePDNS(self):
4949
if items.find('slave') > -1:
5050
continue
5151

52-
counter = counter + 1
52+
if items.find('master') > -1:
53+
continue
5354

54-
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
55-
writeToFile = open(tempPath, 'w')
55+
counter = counter + 1
5656

57-
for items in data:
5857
writeToFile.writelines(items + '\n')
5958

59+
6060
writeToFile.writelines('allow-axfr-ips=' + ipsString + '\n')
6161
writeToFile.writelines('also-notify=' + ipStringNoSubnet + '\n')
6262
writeToFile.writelines('daemon=no\n')
@@ -82,6 +82,9 @@ def managePDNS(self):
8282
if items.find('slave') > -1:
8383
continue
8484

85+
if items.find('slave=yes') > 1:
86+
return 0
87+
8588
counter = counter + 1
8689

8790
tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
@@ -112,6 +115,5 @@ def managePDNS(self):
112115
Supermasters(ip=self.extraArgs['masterServerIP'], nameserver=self.extraArgs['slaveServerNS'], account='').save()
113116

114117
command = 'sudo mv ' + tempPath + ' ' + path
115-
#subprocess.call(shlex.split(command))
116118
ProcessUtilities.executioner(command)
117119

‎manageServices/templates/manageServices/managePowerDNS.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,57 +51,57 @@ <h3 class="content-box-header">
5151

5252
<div ng-hide="masterServerHD" class="form-group">
5353
<label class="col-sm-3 control-label">{% trans "Slave Server" %}</label>
54-
<div class="col-sm-6">
54+
<div ng-init="slaveServerNS='{{ slaveServerNS }}'" class="col-sm-6">
5555
<input type="text" class="form-control" ng-model="slaveServerNS" required>
5656
</div>
5757
</div>
5858

5959
<div ng-hide="masterServerHD" class="form-group">
6060
<label class="col-sm-3 control-label">{% trans "Master Server IP" %}</label>
61-
<div class="col-sm-6">
61+
<div ng-init="masterServerIP='{{ masterServerIP }}'" class="col-sm-6">
6262
<input type="text" class="form-control" ng-model="masterServerIP" required>
6363
</div>
6464
</div>
6565

6666
<div ng-hide="slaveIPs" class="form-group">
6767
<label class="col-sm-3 control-label">{% trans "Slave Server 1" %}</label>
68-
<div class="col-sm-6">
68+
<div ng-init="slaveServer='{{ slaveServer }}'" class="col-sm-6">
6969
<input type="text" class="form-control" ng-model="slaveServer" required>
7070
</div>
7171
</div>
7272

7373
<div ng-hide="slaveIPs" class="form-group">
7474
<label class="col-sm-3 control-label">{% trans "Slave Server IP" %}</label>
75-
<div class="col-sm-6">
75+
<div ng-init="slaveServerIP='{{ slaveServerIP }}'" class="col-sm-6">
7676
<input type="text" class="form-control" ng-model="slaveServerIP" required>
7777
</div>
7878
</div>
7979

8080
<div ng-hide="slaveIPs" class="form-group">
8181
<label class="col-sm-3 control-label">{% trans "Slave Server 2 (Optional)" %}</label>
82-
<div class="col-sm-6">
82+
<div ng-init="slaveServer2='{{ slaveServer2 }}'" class="col-sm-6">
8383
<input type="text" class="form-control" ng-model="slaveServer2" required>
8484
</div>
8585
</div>
8686

8787
<div ng-hide="slaveIPs" class="form-group">
8888
<label class="col-sm-3 control-label">{% trans "Slave Server IP 2 (Optional)" %}</label>
89-
<div class="col-sm-6">
89+
<div ng-init="slaveServerIP2='{{ slaveServerIP2 }}'" class="col-sm-6">
9090
<input type="text" class="form-control" ng-model="slaveServerIP2" required>
9191
</div>
9292
</div>
9393

9494
<div ng-hide="slaveIPs" class="form-group">
9595
<label class="col-sm-3 control-label">{% trans "Slave Server 3 (Optional)" %}</label>
96-
<div class="col-sm-6">
96+
<div ng-init="slaveServer3='{{ slaveServer3 }}'" class="col-sm-6">
9797
<input type="text" class="form-control" ng-model="slaveServer3" required>
9898
</div>
9999
</div>
100100

101101
<div ng-hide="slaveIPs" class="form-group">
102102
<label class="col-sm-3 control-label">{% trans "Slave Server IP 3 (Optional)" %}</label>
103-
<div class="col-sm-6">
104-
<input type="text" class="form-control" ng-model="slaveIPData" required>
103+
<div ng-init="slaveServerIP3='{{ slaveServerIP3 }}'" class="col-sm-6">
104+
<input type="text" class="form-control" ng-model="slaveServerIP3" required>
105105
</div>
106106
</div>
107107

‎manageServices/views.py‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# -*- coding: utf-8 -*-
22

3-
43
from django.shortcuts import render
54
from django.shortcuts import HttpResponse, redirect
65
import plogical.CyberCPLogFileWriter as logging
@@ -14,19 +13,41 @@
1413
from plogical.processUtilities import ProcessUtilities
1514
# Create your views here.
1615

17-
1816
def managePowerDNS(request):
1917
try:
2018
userID = request.session['userID']
2119
currentACL = ACLManager.loadedACL(userID)
2220

21+
2322
if currentACL['admin'] == 1:
2423
pass
2524
else:
2625
return ACLManager.loadError()
2726
try:
28-
return render(request, 'manageServices/managePowerDNS.html', {"status": 1})
2927

28+
data = {}
29+
data['status'] = 1
30+
31+
pdnsStatus = PDNSStatus.objects.get(pk=1)
32+
33+
if pdnsStatus.type == 'MASTER':
34+
counter = 1
35+
36+
for items in SlaveServers.objects.all():
37+
38+
if counter == 1:
39+
data['slaveServer'] = items.slaveServer
40+
data['slaveServerIP'] = items.slaveServerIP
41+
else:
42+
data['slaveServer%s' % (str(counter))] = items.slaveServer
43+
data['slaveServerIP%s' % (str(counter))] = items.slaveServerIP
44+
45+
counter = counter + 1
46+
else:
47+
data['slaveServerNS'] = pdnsStatus.masterServer
48+
data['masterServerIP'] = pdnsStatus.masterIP
49+
50+
return render(request, 'manageServices/managePowerDNS.html', data)
3051
except BaseException as msg:
3152
logging.CyberCPLogFileWriter.writeToFile(str(msg))
3253
return HttpResponse("See CyberCP main log file.")

0 commit comments

Comments
 (0)