mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge branch 'master' into handle-oceania

Browse Source
This commit is contained in:
Pavan Chandrashekar
2020-03-03 17:07:11 -08:00
committed by GitHub
parent 0daa37578b 2fd725497d
commit 35b835e8aa
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
octodns/source/axfr.py
View File

@@ -192,12 +192,17 @@ class ZoneFileSource(AxfrBaseSource):
# The directory holding the zone files # The directory holding the zone files
# Filenames should match zone name (eg. example.com.) # Filenames should match zone name (eg. example.com.)
directory: ./zonefiles directory: ./zonefiles
# Should sanity checks of the origin node be done
# (optional, default true)
check_origin: false
''' '''
def __init__(self, id, directory): def __init__(self, id, directory, check_origin=True):
self.log = logging.getLogger('ZoneFileSource[{}]'.format(id)) self.log = logging.getLogger('ZoneFileSource[{}]'.format(id))
self.log.debug('__init__: id=%s, directory=%s', id, directory) self.log.debug('__init__: id=%s, directory=%s, check_origin=%s', id,
directory, check_origin)
super(ZoneFileSource, self).__init__(id) super(ZoneFileSource, self).__init__(id)
self.directory = directory self.directory = directory
self.check_origin = check_origin
self._zone_records = {} self._zone_records = {}
@@ -206,7 +211,8 @@ class ZoneFileSource(AxfrBaseSource):
if zone_name in zonefiles: if zone_name in zonefiles:
try: try:
z = dns.zone.from_file(join(self.directory, zone_name), z = dns.zone.from_file(join(self.directory, zone_name),
zone_name, relativize=False) zone_name, relativize=False,
check_origin=self.check_origin)
except DNSException as error: except DNSException as error:
raise ZoneFileSourceLoadFailure(error) raise ZoneFileSourceLoadFailure(error)
else: else:

6
requirements.txt
View File

@@ -1,8 +1,8 @@
PyYaml==5.3 PyYaml==5.3
azure-common==1.1.24 azure-common==1.1.24
azure-mgmt-dns==3.0.0 azure-mgmt-dns==3.0.0
boto3==1.12.5 boto3==1.12.11
botocore==1.15.5 botocore==1.15.11
dnspython==1.16.0 dnspython==1.16.0
docutils==0.16 docutils==0.16
dyn==1.8.1 dyn==1.8.1
@@ -11,7 +11,7 @@ futures==3.2.0; python_version < '3.0'
google-cloud-core==1.3.0 google-cloud-core==1.3.0
google-cloud-dns==0.32.0 google-cloud-dns==0.32.0
ipaddress==1.0.23 ipaddress==1.0.23
jmespath==0.9.4 jmespath==0.9.5
msrestazure==0.6.2 msrestazure==0.6.2
natsort==6.2.1 natsort==6.2.1
ns1-python==0.15.0 ns1-python==0.15.0