Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix to cPanel Importer: DNS

Browse Source
This commit is contained in:
Usman Nasir
2019-08-17 21:14:37 +05:00
parent 438f1671cc
commit b26ad92f95
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plogical/cPanelImporter.py
View File

@@ -539,9 +539,17 @@ class cPanelImporter:
RecordsData[4] = ipAddress RecordsData[4] = ipAddress
if RecordsData[0].find(topLevelDomain) > -1: if RecordsData[0].find(topLevelDomain) > -1:
DNS.createDNSRecord(zone, RecordsData[0].replace('.', ''), RecordsData[3], RecordsData[4], 0, RecordsData[1]) if RecordsData[3] == 'MX':
DNS.createDNSRecord(zone, RecordsData[0].rstrip('.'), RecordsData[3],RecordsData[5].rstrip('.').rstrip('.\n'), int(RecordsData[4]), RecordsData[1])
else: else:
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain , RecordsData[3], RecordsData[4], 0, DNS.createDNSRecord(zone, RecordsData[0].rstrip('.'), RecordsData[3], RecordsData[4].rstrip('.').rstrip('.\n'), 0, RecordsData[1])
else:
if RecordsData[3] == 'MX':
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain, RecordsData[3],
RecordsData[5].rstrip('.').rstrip('.\n'), RecordsData[4],
RecordsData[1])
else:
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain , RecordsData[3], RecordsData[4].rstrip('.').rstrip('.\n'), 0,
RecordsData[1]) RecordsData[1])
except BaseException, msg: except BaseException, msg:
message = 'Failed while creating DNS entry for %s, error message: %s.' % (topLevelDomain, str(msg)) message = 'Failed while creating DNS entry for %s, error message: %s.' % (topLevelDomain, str(msg))

2
websiteFunctions/templates/websiteFunctions/listWebsites.html
View File

@@ -78,7 +78,7 @@
<div class="col-md-4 content-box-header"> <div class="col-md-4 content-box-header">
<i class="p fa fa-hdd-o btn-icon text-muted" data-toggle="tooltip" data-placement="right" <i class="p fa fa-hdd-o btn-icon text-muted" data-toggle="tooltip" data-placement="right"
title="Email">&emsp;</i> title="Disk Usage">&emsp;</i>
<span ng-bind="web.diskUsed" style="text-transform: none"></span> <span ng-bind="web.diskUsed" style="text-transform: none"></span>
</div> </div>

5
websiteFunctions/website.py
View File

@@ -2049,8 +2049,11 @@ IdentityFile /home/%s/.ssh/%s
state = "Suspended" state = "Suspended"
else: else:
state = "Active" state = "Active"
diskUsed = "%sMB" % str(
virtualHostUtilities.getDiskUsage("/home/" + items.domain, items.package.diskSpace)[0])
dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress, dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress,
'admin': items.admin.userName, 'package': items.package.packageName, 'state': state} 'admin': items.admin.userName, 'package': items.package.packageName, 'state': state, 'diskUsed': diskUsed}
if checker == 0: if checker == 0:
json_data = json_data + json.dumps(dic) json_data = json_data + json.dumps(dic)