From 3d605e546de25e30009bd6e389aa00e84e2ea75d Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 7 Nov 2021 18:12:12 +0100
Subject: [PATCH] wip

---
 bundles/bind/items.py    | 2 +-
 bundles/bind/metadata.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/bind/items.py b/bundles/bind/items.py
index 5ee763c..a318bb4 100644
--- a/bundles/bind/items.py
+++ b/bundles/bind/items.py
@@ -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()
             },
         },
diff --git a/bundles/bind/metadata.py b/bundles/bind/metadata.py
index d737bc4..8150de5 100644
--- a/bundles/bind/metadata.py
+++ b/bundles/bind/metadata.py
@@ -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}'