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

bug fix: configure default nameservers

Browse Source
This commit is contained in:
Usman Nasir
2020-01-31 18:00:39 +05:00
parent 8a2cd09d62
commit a9b6f298d7
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dns/dnsManager.py
View File

@@ -15,7 +15,6 @@ from .models import Domains,Records
from re import match,I,M from re import match,I,M
from plogical.mailUtilities import mailUtilities from plogical.mailUtilities import mailUtilities
from plogical.acl import ACLManager from plogical.acl import ACLManager
from manageServices.models import PDNSStatus
class DNSManager: class DNSManager:
defaultNameServersPath = '/home/cyberpanel/defaultNameservers' defaultNameServersPath = '/home/cyberpanel/defaultNameservers'
@@ -511,19 +510,19 @@ class DNSManager:
if os.path.exists(DNSManager.defaultNameServersPath): if os.path.exists(DNSManager.defaultNameServersPath):
nsData = open(DNSManager.defaultNameServersPath, 'r').readlines() nsData = open(DNSManager.defaultNameServersPath, 'r').readlines()
try: try:
data['firstNS'] = nsData[0] data['firstNS'] = nsData[0].rstrip('\n')
except: except:
pass pass
try: try:
data['secondNS'] = nsData[1] data['secondNS'] = nsData[1].rstrip('\n')
except: except:
pass pass
try: try:
data['thirdNS'] = nsData[2] data['thirdNS'] = nsData[2].rstrip('\n')
except: except:
pass pass
try: try:
data['forthNS'] = nsData[3] data['forthNS'] = nsData[3].rstrip('\n')
except: except:
pass pass
@@ -545,16 +544,16 @@ class DNSManager:
nsContent = '' nsContent = ''
try: try:
nsContent = '%s\n%s\n%s\n%s\n' % (data['firstNS'], data['secondNS'], data['thirdNS'], data['forthNS']) nsContent = '%s\n%s\n%s\n%s\n' % (data['firstNS'].rstrip('\n'), data['secondNS'].rstrip('\n'), data['thirdNS'].rstrip('\n'), data['forthNS'].rstrip('\n'))
except: except:
try: try:
nsContent = '%s\n%s\n%s\n' % (data['firstNS'], data['secondNS'], data['thirdNS']) nsContent = '%s\n%s\n%s\n' % (data['firstNS'].rstrip('\n'), data['secondNS'].rstrip('\n'), data['thirdNS'].rstrip('\n'))
except: except:
try: try:
nsContent = '%s\n%s\n' % (data['firstNS'], data['secondNS']) nsContent = '%s\n%s\n' % (data['firstNS'].rstrip('\n'), data['secondNS'].rstrip('\n'))
except: except:
try: try:
nsContent = '%s\n' % (data['firstNS']) nsContent = '%s\n' % (data['firstNS'].rstrip('\n'))
except: except:
pass pass

0
loginSystem/views.py Executable file → Normal file
View File

21
plogical/dnsUtilities.py
View File

@@ -76,16 +76,17 @@ class DNS:
defaultNS = open(DNS.defaultNameServersPath, 'r').readlines() defaultNS = open(DNS.defaultNameServersPath, 'r').readlines()
for items in defaultNS: for items in defaultNS:
record = Records(domainOwner=zone, if len(items) > 5:
domain_id=zone.id, record = Records(domainOwner=zone,
name=topLevelDomain, domain_id=zone.id,
type="NS", name=topLevelDomain,
content=items, type="NS",
ttl=3600, content=items.rstrip('\n'),
prio=0, ttl=3600,
disabled=0, prio=0,
auth=1) disabled=0,
record.save() auth=1)
record.save()
else: else:
record = Records(domainOwner=zone, record = Records(domainOwner=zone,
domain_id=zone.id, domain_id=zone.id,