This commit is contained in:
mwiegand 2021-11-07 18:12:12 +01:00
parent f333ad963e
commit 3d605e546d
2 changed files with 5 additions and 5 deletions

View file

@ -70,7 +70,7 @@ files['/etc/bind/named.conf.local'] = {
'acls': {
**master_node.metadata.get('bind/acls'),
**{
view_name: view_conf['acl']
view_name: view_conf['match_clients']
for view_name, view_conf in master_node.metadata.get('bind/views').items()
},
},

View file

@ -24,7 +24,7 @@ defaults = {
'internal': {
'is_internal': True,
'keys': {},
'acl': {
'match_clients': {
'our-nets',
},
'zones': {},
@ -33,7 +33,7 @@ defaults = {
'default': True,
'is_internal': False,
'keys': {},
'acl': {
'match_clients': {
'any',
},
'zones': {},
@ -162,7 +162,7 @@ def ns_records(metadata):
for nameserver in nameservers
}
}
for zone_name, zone_conf in view_conf['zones'].items()
for zone_name, zone_conf in view_conf['zones'].items()
}
}
for view_name, view_conf in metadata.get('bind/views').items()
@ -224,7 +224,7 @@ def generate_acl_entries_for_keys(metadata):
'bind': {
'views': {
view_name: {
'acl': {
'match_clients': {
# allow keys from this view
*{
f'key {key}'