Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-04 20:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix to permissions and DNS creation!

Browse Source
This commit is contained in:
usmannasir
2018-02-13 11:45:44 +05:00
parent a010f7982e
commit f942945c13
8 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
<tr>
<th>Domain</th>
<th>Launch</th>
<th>IP Address</th>
<th>Package</th>
<th>Owner</th>
<th>State</th>
@@ -38,6 +39,7 @@
<tr ng-repeat="web in WebSitesList track by $index">
<td ng-bind="web.domain"></td>
<td><a href="{$ web.domain $}"><img width="30px" height="30" class="center-block" src="{% static 'baseTemplate/assets/image-resources/webPanel.png' %}"></a></td>
<td ng-bind="web.ipAddress"></td>
<td ng-bind="web.package"></td>
<td ng-bind="web.admin"></td>
<td ng-bind="web.state"></td>

35
websiteFunctions/views.py
View File

@@ -312,7 +312,12 @@ def submitWebsiteCreation(request):
soaRecord.save()
try:
recordContentA = requests.get('https://api.ipify.org').text
ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile)
ipData = f.read()
recordContentA = ipData.split('\n', 1)[0]
zone = Domains.objects.get(name=domain)
record = Records(domainOwner=zone,
domain_id=zone.id,
@@ -324,12 +329,16 @@ def submitWebsiteCreation(request):
disabled=0,
auth=1)
record.save()
except:
pass
except BaseException,msg:
logging.CyberCPLogFileWriter.writeToFile("Unable to add A record while creating website, error: " + str(msg))
except:
try:
recordContentA = requests.get('https://api.ipify.org').text
ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile)
ipData = f.read()
recordContentA = ipData.split('\n', 1)[0]
zone = Domains.objects.get(name=domain)
record = Records(domainOwner=zone,
domain_id=zone.id,
@@ -341,15 +350,14 @@ def submitWebsiteCreation(request):
disabled=0,
auth=1)
record.save()
except:
pass
except BaseException,msg:
logging.CyberCPLogFileWriter.writeToFile("Unable to add A record while creating website, error: " + str(msg))
## zone creation
selectedPackage = Package.objects.get(packageName=packageName)
website = Websites(admin=admin, package=selectedPackage, domain=domain, adminEmail=adminEmail,
phpSelection=phpSelection, ssl=data['ssl'], externalApp=externalApp)
website = Websites(admin=admin, package=selectedPackage, domain=domain, adminEmail=adminEmail,phpSelection=phpSelection, ssl=data['ssl'], externalApp=externalApp)
website.save()
@@ -567,12 +575,21 @@ def getFurtherAccounts(request):
json_data = "["
checker = 0
try:
ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile)
ipData = f.read()
ipAddress = ipData.split('\n', 1)[0]
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile("Failed to read machine IP, error:" + str(msg))
ipAddress = "192.168.100.1"
for items in websites:
if items.state == 0:
state = "Suspended"
else:
state = "Active"
dic = {'domain': items.domain, 'adminEmail': items.adminEmail,'admin': items.admin.userName,'package': items.package.packageName,'state':state}
dic = {'domain': items.domain, 'adminEmail': items.adminEmail,'ipAddress':ipAddress,'admin': items.admin.userName,'package': items.package.packageName,'state':state}
if checker == 0:
json_data = json_data + json.dumps(dic)