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

bug fix: create proper backups incase of multiple database users

Browse Source
This commit is contained in:
Usman Nasir
2021-04-11 22:58:22 +05:00
parent 8ce49c303d
commit c83eb3ab6c
5 changed files with 136 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plogical/dnsUtilities.py
View File

@@ -41,7 +41,7 @@ class DNS:
self.status = data[2].rstrip('\n')
return 1
else:
logging.CyberCPLogFileWriter.writeToFile('User %s does not have CloudFlare configured.' % (self.admin.userName))
#logging.CyberCPLogFileWriter.writeToFile('User %s does not have CloudFlare configured.' % (self.admin.userName))
return 0
def cfTemplate(self, zoneDomain, admin, enableCheck=None):
@@ -711,26 +711,30 @@ class DNS:
## Add Record to CF if SYNC Enabled
dns = DNS()
dns.admin = zone.admin
dns.loadCFKeys()
try:
cf = CloudFlare.CloudFlare(email=dns.email, token=dns.key)
dns = DNS()
dns.admin = zone.admin
dns.loadCFKeys()
if dns.status == 'Enable':
try:
params = {'name': zone.name, 'per_page': 50}
zones = cf.zones.get(params=params)
cf = CloudFlare.CloudFlare(email=dns.email, token=dns.key)
for zone in sorted(zones, key=lambda v: v['name']):
zone = zone['id']
if dns.status == 'Enable':
try:
params = {'name': zone.name, 'per_page': 50}
zones = cf.zones.get(params=params)
DNS.createDNSRecordCloudFlare(cf, zone, name, type, value, ttl, priority)
for zone in sorted(zones, key=lambda v: v['name']):
zone = zone['id']
except CloudFlare.exceptions.CloudFlareAPIError as e:
logging.CyberCPLogFileWriter.writeToFile(str(e))
except Exception as e:
logging.CyberCPLogFileWriter.writeToFile(str(e))
DNS.createDNSRecordCloudFlare(cf, zone, name, type, value, ttl, priority)
except CloudFlare.exceptions.CloudFlareAPIError as e:
logging.CyberCPLogFileWriter.writeToFile(str(e))
except Exception as e:
logging.CyberCPLogFileWriter.writeToFile(str(e))
except:
pass
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [createDNSRecord]")