kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 2 Releases Activity

dns: fix some errors

Browse source
This commit is contained in:
Franzi 2021-09-06 16:42:14 +02:00
parent 38ba67a335
commit de6249c65d
Signed by: kunsi
GPG key ID: 12E3D2136B818350
6 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bundles/powerdns/items.py
View file

@ -24,7 +24,7 @@ $TTL 60
)
"""
for rnode in sorted(repo.nodes_in_group('dns')):
ZONE_HEADER += '@ IN NS {}.\n'.format(rnode.metadata.get('powerdns/my_hostname', rnode.metadata['hostname']))
ZONE_HEADER += '@ IN NS {}.\n'.format(rnode.metadata.get('powerdns/my_hostname', rnode.metadata.get('hostname')))
directories = {
'/etc/powerdns/pdns.d': {
@ -51,10 +51,10 @@ files = {
'content_type': 'mako',
'context': {
'api_key': node.metadata['powerdns']['api_key'],
'my_hostname': node.metadata['powerdns'].get('my_hostname', node.name),
'my_hostname': node.metadata['powerdns'].get('my_hostname', node.metadata.get('hostname')),
'is_secondary': node.metadata['powerdns'].get('is_secondary', False),
'my_primary_servers': node.metadata['powerdns'].get('my_primary_servers', {}),
'my_secondary_servers': node.metadata['powerdns'].get('my_secondary_servers', {}),
'my_primary_servers': node.metadata['powerdns'].get('my_primary_servers', set()),
'my_secondary_servers': node.metadata['powerdns'].get('my_secondary_servers', set()),
},
'needs': {
'pkg_apt:pdns-server',
@ -99,13 +99,16 @@ if node.metadata.get('powerdns/features/bind', False):
primary_zones.add(zone)
files["/var/lib/powerdns/zones/{}".format(zone)] = {
files[f'/var/lib/powerdns/zones/{zone}'] = {
'content_type': 'mako',
'context': {
'header': ZONE_HEADER.format(serial=serial),
'metadata_records': node.metadata.get('powerdns/bind-zones/{}/records'.format(zone), []),
'metadata_records': node.metadata.get(f'powerdns/bind-zones/{zone}/records', []),
},
'source': 'bind-zones/{}'.format(zone),
'source': f'bind-zones/{zone}',
# TODO enable this once bundlewrap has test_with
# was introduced in https://github.com/bundlewrap/bundlewrap/commit/cb7e9c161719acd70d132a7b24f0d231a8cb3fa3
#'test_with': f'named-checkzone {zone} {{}}',
'triggers': {
'action:powerdns_reload_zones',
},