fix(templates): render allow-notify and correct allow-query-on statement

The zone option allow_notify was documented in defaults/main.yaml but never rendered by
named.conf.views.j2. Any allow_notify list configured for a zone was silently dropped, so
secondaries kept accepting NOTIFY messages only from the hosts listed in the masters statement.

In addition, the allow_query_on block emitted the statement name allow-query instead of
allow-query-on. This produced a second allow-query clause in the same zone and thereby
overrode the interface restriction that was actually intended.

Co-authored-by: Copilot <copilot@github.com>

.ansible-lint

@@ -1,3 +1,4 @@
 ---
 
-skip_list: []
+exclude_paths:
+- .gitea/

.drone.yml

@@ -1,53 +0,0 @@
----
-kind: pipeline
-type: kubernetes
-name: linter
-
-node_selector:
-  kubernetes.io/arch: amd64
-  kubernetes.io/os: linux
-
-steps:
-- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.39.0
-  resources:
-    limits:
-      cpu: 50
-      memory: 50M
-
-- name: ansible lint
-  commands:
-  - ansible-lint .
-  image: docker.io/volkerraschek/ansible-archlinux:latest
-  pull: always
-  resources:
-    limits:
-      cpu: 250
-      memory: 250M
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-    exclude:
-    - tag

.gitea/workflows/ansible-linters.yaml

@@ -0,0 +1,20 @@
+name: Ansible Linter
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  ansible-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+    - name: Run ansible-lint
+      uses: ansible/ansible-lint@665d9e07a1943254d2910faffc106adaf7ea7294 # v26.8.0
+      with:
+        args: "--config-file .ansible-lint"
+        setup_python: "true"

.gitea/workflows/markdown-linters.yaml

@@ -0,0 +1,18 @@
+name: Lint Markdown files
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  markdown-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+    - uses: DavidAnson/markdownlint-cli2-action@ded1f9488f68a970bc66ea5619e13e9b52e601cd # v23.2.0
+      with:
+        globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -0,0 +1,22 @@
+name: Release Ansible Role
+
+on:
+  push:
+    tags:
+    - '**'
+  workflow_dispatch: {}
+
+jobs:
+  release:
+    name: Release Ansible Role
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Ansible Galaxy
+      run: |
+        apt update --yes
+        apt install --yes ansible
+    - env:
+        ANSIBLE_GALAXY_TOKEN: ${{ secrets.ANSIBLE_GALAXY_TOKEN }}
+      name: Update Ansible Role in Ansible Galaxy
+      run: |
+        ansible-galaxy role import --token=${ANSIBLE_GALAXY_TOKEN} volker-raschek ${GITHUB_REPOSITORY#*/}

.gitignore

@@ -0,0 +1 @@
+.ansible

.markdownlint.yaml

@@ -45,19 +45,17 @@ MD012:
 # MD013/line-length - Line length
 MD013:
   # Number of characters
-  line_length: 80
+  line_length: 120
   # Number of characters for headings
-  heading_line_length: 80
+  heading_line_length: 120
   # Number of characters for code blocks
-  code_block_line_length: 80
+  code_block_line_length: 120
   # Include code blocks
   code_blocks: false
   # Include tables
   tables: false
   # Include headings
   headings: true
-  # Include headings
-  headers: true
   # Strict length checking
   strict: false
   # Stern length checking
@@ -70,11 +68,6 @@ MD022:
   # Blank lines below heading
   lines_below: 1
 
-# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
-MD024:
-  # Only check sibling headings
-  allow_different_nesting: true
-
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
   # Heading level

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+  "ansible.python.interpreterPath": "/bin/python",
+  "files.associations": {
+    "**/.gitea/**/*.yml": "yaml",
+    "**/.gitea/**/*.yaml": "yaml",
+    "docker-compose*.yml": "dockercompose",
+    "*.yml": "ansible",
+    "*.yaml": "ansible",
+    ".yamllint": "yaml",
+    ".yamllint.yml": "yaml",
+    ".yamllint.yaml": "yaml"
+  },
+  "rewrap.wrappingColumn": 120
+}

README.md

@@ -1,6 +1,5 @@
 # bind9-role
 
-[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/bind9-role/status.svg)](https://drone.cryptic.systems/volker.raschek/bind9-role)
 [![Ansible Role](https://img.shields.io/ansible/role/d/58170)](https://galaxy.ansible.com/volker_raschek/bind9)
 
 With following role can be bind installed and configured.

defaults/main.yaml

@@ -1,7 +1,7 @@
 ---
 
 bind9_acls:
-- name: internalnets
+- name: "internalnets"
   permissions: []
   # - "111.222.111.222"
 
@@ -41,7 +41,8 @@ bind9_options:
   allow_update_forwarding: []
   auth_nxdomain: false
   blackhole: []
-  dnssec_validation: true
+  dnssec_accept_expired: false
+  dnssec_validation: "auto"
   forwarders:
   - ip: "8.8.8.8"               # Google IPv4
     port: "53"
@@ -60,6 +61,7 @@ bind9_options:
   - ip: "2620:0:ccd::2"         # OpenDNS IPv6
     port: "53"
   interface_interval: 0
+  key_directory: "/var/named/dnssec-keys"
   listen_on_ipv4:
   - "127.0.0.1"
   listen_on_ipv6:
@@ -83,6 +85,23 @@ bind9_rndc_key:
   algorithm: ""
   secret: ""
 
+bind9_dnssec_keys: []
+# - origin: "hellenthal.cryptic.systems"
+#   key_signing_key:
+#     private:
+#       filename: "{{ bind9_options.key_directory }}/example.com.private"
+#       content: "private key"
+#     public:
+#       filename: "{{ bind9_options.key_directory }}/example.com.private"
+#       content: "public key"
+#   zone_signing_key:
+#     private:
+#       filename: "{{ bind9_options.key_directory }}/example.com.private"
+#       content: "private key"
+#     public:
+#       filename: "{{ bind9_options.key_directory }}/example.com.private"
+#       content: "public key"
+
 bind9_statics:
   enabled: true
   channels:
@@ -98,46 +117,52 @@ bind9_tsigkeys: []
 #   secret: "secret"
 
 bind9_views: []
-# - name: external
+# - name: "external"
 #   match_clients:
 #   - "!internalnets"
 #   - "any"
 #   zones:
-#   - allow_notify: []
-#     allow_query:
-#     - "any"
-#     allow_query_on: []
-#     allow_update: []
-#     allow_update_forwarding: []
-#     allow_transfer: []
+#   - config:
+#       allow_notify: []
+#       allow_query:
+#       - "any"
+#       allow_query_on: []
+#       allow_update: []
+#       allow_update_forwarding: []
+#       allow_transfer: []
+#       file: zones/external/db.local.example
+#       origin: "example.local."
+#       type: master
+#       notify: true
 #     file: zones/external/db.local.example
-#     origin: "example.local."
-#     type: master
-#     notify: true
-# - name: internal
+# - name: "internal"
 #   match_clients:
 #   - "!192.168.178.1"
 #   - "internalnets"
 #   - "127.0.0.0/8"
 #   zones:
-#   - allow_notify: []
-#     allow_query:
-#     - "any"
-#     allow_query_on: []
-#     allow_update: []
-#     allow_update_forwarding: []
-#     allow_transfer: []
+#   - config:
+#       allow_notify: []
+#       allow_query:
+#       - "any"
+#       allow_query_on: []
+#       allow_update: []
+#       allow_update_forwarding: []
+#       allow_transfer: []
+#       file: zones/internal/db.local.example
+#       origin: "example.local."
+#       type: master
 #     file: zones/internal/db.local.example
-#     origin: "example.local."
-#     type: master
-#   - allow_notify: []
-#     allow_query: []
-#     allow_query_on: []
-#     allow_update: []
-#     allow_update_forwarding: []
-#     allow_transfer: []
-#     forward: only
-#     forwarders:
-#     - 192.168.175.1
-#     origin: "glr.external.local."
-#     type: forward
+#   - config:
+#       allow_notify: []
+#       allow_query: []
+#       allow_query_on: []
+#       allow_update: []
+#       allow_update_forwarding: []
+#       allow_transfer: []
+#       forward: only
+#       forwarders:
+#       - 192.168.175.1
+#       origin: "gitlab-runner.external.local"
+#       type: forward
+#     file: "gitlab-runner.external.local"

meta/main.yaml

@@ -1,24 +1,26 @@
+dependencies: []
 galaxy_info:
-  role_name: bind9
   author: Markus Pesch
-  description: Role to install and configure bind9 on different distributions
   company: Cryptic Systems
+  description: Role to install and configure bind9 on different distributions
+  galaxy_tags:
+  - named
+  - bind
+  - dyndns
   license: MIT
   min_ansible_version: "2.9"
+  namespace: volker-raschek
   platforms:
   - name: ArchLinux
     versions:
     - all
-  - name: Ubuntu
-    versions:
-    - all
   - name: EL
     versions:
     - all
-
-  galaxy_tags:
-  - named
-  - bind
-  - dyndns
-
-dependencies: []
+  - name: Fedora
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  role_name: bind9

renovate.json

@@ -1,15 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
-  "labels": [ "renovate" ],
-  "packageRules": [
-    {
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
-      "automerge": true,
-      "matchManagers": "droneci",
-      "matchUpdateTypes": [ "minor", "patch"]
-    }
-  ],
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch"
-}
+  "extends": [
+    "local>volker.raschek/renovate-config:default#master",
+    "local>volker.raschek/renovate-config:container#master",
+    "local>volker.raschek/renovate-config:actions#master",
+    "local>volker.raschek/renovate-config:regexp#master"
+  ]
+}

tasks/create_dnssec_files.yaml

@@ -0,0 +1,25 @@
+---
+
+- name: "Create private DNSSEC: {{ bind9_dnssec_key.origin }}"
+  ansible.builtin.copy:
+    dest: "{{ item.private.filename }}"
+    content: "{{ item.private.content }}"
+    owner: "{{ bind_unix_user }}"
+    group: "{{ bind_unix_group }}"
+    mode: "0600"
+  no_log: true
+  with_items:
+  - "{{ bind9_dnssec_key.key_signing_key }}"
+  - "{{ bind9_dnssec_key.zone_signing_key }}"
+
+- name: "Create public DNSSEC: {{ bind9_dnssec_key.origin }}"
+  ansible.builtin.copy:
+    dest: "{{ item.public.filename }}"
+    content: "{{ item.public.content }}"
+    owner: "{{ bind_unix_user }}"
+    group: "{{ bind_unix_group }}"
+    mode: "0644"
+  no_log: true
+  with_items:
+  - "{{ bind9_dnssec_key.key_signing_key }}"
+  - "{{ bind9_dnssec_key.zone_signing_key }}"

tasks/main.yaml

@@ -1,7 +1,17 @@
 ---
 
 - name: Include OS-specific variables
-  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+      - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['architecture'] }}.yaml"
+      - "{{ ansible_facts['distribution'] }}.yaml"
+      - "{{ ansible_facts['os_family'] }}_{{ ansible_facts['architecture'] }}.yaml"
+      - "{{ ansible_facts['os_family'] }}.yaml"
+      - main.yaml
+      paths:
+      - vars
 
 - name: Install bind and dependencies
   ansible.builtin.package:
@@ -41,8 +51,49 @@
       state: absent
     with_items: "{{ files_to_delete.files }}"
 
+- name: Remove existing signed zone files
+  block:
+  - name: Find existing signed zone files
+    ansible.builtin.find:
+      path: "{{ bind_config_directory }}"
+      recurse: true
+      patterns: "*.signed"
+    register: files_to_delete
+  - name: Delete existing signed zone files
+    ansible.builtin.file:
+      path: "{{ item.path }}"
+      state: absent
+    with_items: "{{ files_to_delete.files }}"
+
+- name: Remove existing DNSSEC key directory
+  block:
+  - name: Check if DNSSEC key directory exists
+    ansible.builtin.stat:
+      path: "{{ bind9_options.key_directory }}"
+    register: _stat_bind9_options_key_directory
+  - name: Remove DNSSEC key directory
+    ansible.builtin.file:
+      path: "{{ bind9_options.key_directory }}"
+      state: "absent"
+    when: _stat_bind9_options_key_directory.stat.exists
+
+- name: Create DNSSEC key directory
+  ansible.builtin.file:
+    path: "{{ bind9_options.key_directory }}"
+    owner: "{{ bind_unix_user }}"
+    group: "{{ bind_unix_group }}"
+    mode: "0700"
+    state: directory
+
+- name: Create DNSSEC files
+  ansible.builtin.include_tasks: create_dnssec_files.yaml
+  with_items: "{{ bind9_dnssec_keys }}"
+  no_log: true
+  loop_control:
+    loop_var: bind9_dnssec_key
+
 - name: Create DNS-Zone files
-  ansible.builtin.include_tasks: template_zone_files.yml
+  ansible.builtin.include_tasks: template_zone_files.yaml
   with_items:
   - "{{ bind9_views }}"
   loop_control:

tasks/sign_zone_file.yaml

@@ -0,0 +1,28 @@
+---
+
+- name: "Sign DNS Zone {{ zone.config.origin }}"
+  vars:
+    dnssec_cmd:
+    - dnssec-signzone
+    - -N
+    - INCREMENT
+    - -S
+    - -K
+    - "{{ bind9_options.key_directory }}"
+  block:
+  - name: "Extend dnssec command of ORIGIN"
+    ansible.builtin.set_fact:
+      _dnssec_cmd: "{{ dnssec_cmd + ['-o', zone.config.origin] }}"
+  - name: "Extend dnssec command of zone file"
+    ansible.builtin.set_fact:
+      _dnssec_cmd: "{{ _dnssec_cmd + [bind_config_directory + '/' + zone.file] }}"
+  - name: "Sign zone {{ zone.config.origin }}"
+    ansible.builtin.command:
+      argv: "{{ _dnssec_cmd }}"
+      creates: "{{ bind_config_directory + '/' + zone.file }}.signed"
+  - name: Adapt signed zone file permissions
+    ansible.builtin.file:
+      path: "{{ bind_config_directory + '/' + zone.file }}.signed"
+      owner: "{{ bind_unix_user }}"
+      group: "{{ bind_unix_group }}"
+      mode: "0644"

tasks/template_zone_files.yaml

@@ -0,0 +1,48 @@
+---
+
+- name: "Create config directory of DNS zones"
+  ansible.builtin.file:
+    path: "{{ bind_config_directory }}/{{ zone.file | dirname }}"
+    owner: "{{ bind_unix_user }}"
+    group: "{{ bind_unix_group }}"
+    mode: "0755"
+    state: directory
+  with_items:
+  - "{{ view.zones }}"
+  loop_control:
+    loop_var: zone
+  when: zone.file is defined and
+        zone.file | length > 0
+
+- name: "Template view {{ view.name }}"
+  ansible.builtin.template:
+    src: "{{ inventory_hostname }}/etc/named/{{ zone.file }}.j2"
+    dest: "{{ bind_config_directory + '/' + zone.file }}"
+    owner: "{{ bind_unix_user }}"
+    group: "{{ bind_unix_group }}"
+    mode: "0644"
+  with_items:
+  - "{{ view.zones }}"
+  loop_control:
+    loop_var: zone
+  when: zone.config.type == 'master'
+  notify: Restart named
+
+- name: Check if last character in zone files is a newline
+  ansible.builtin.include_tasks: verify_zone_file.yaml
+  with_items:
+  - "{{ view.zones }}"
+  loop_control:
+    loop_var: zone
+  when: zone.config.type == 'master'
+
+- name: Sign Zones
+  ansible.builtin.include_tasks: sign_zone_file.yaml
+  with_items:
+  - "{{ view.zones }}"
+  loop_control:
+    loop_var: zone
+  when: zone.config.type == 'master' and
+        bind9_dnssec_keys | selectattr('origin', 'in', zone.config.origin) | map(attribute='zone_signing_key') | length > 0 and
+        (bind9_dnssec_keys | selectattr('origin', 'in', zone.config.origin) | map(attribute='zone_signing_key'))[0].private | length > 0 and
+        (bind9_dnssec_keys | selectattr('origin', 'in', zone.config.origin) | map(attribute='zone_signing_key'))[0].public  | length > 0

tasks/template_zone_files.yml

@@ -1,28 +0,0 @@
----
-
-- name: "Create directory for zone {{ zone.file | dirname }}"
-  ansible.builtin.file:
-    path: "{{ bind_config_directory }}/{{ zone.file | dirname }}"
-    owner: "{{ bind_unix_user }}"
-    group: "{{ bind_unix_group }}"
-    mode: "0755"
-    state: directory
-  with_items:
-  - "{{ view.zones }}"
-  loop_control:
-    loop_var: zone
-  when: zone.file is defined and zone.file | length > 0
-
-- name: "Template view {{ view.name }}"
-  ansible.builtin.template:
-    src: "{{ inventory_hostname }}/etc/named/{{ zone.file }}.j2"
-    dest: "{{ bind_config_directory }}/{{ zone.file }}"
-    owner: "{{ bind_unix_user }}"
-    group: "{{ bind_unix_group }}"
-    mode: "0644"
-  with_items:
-  - "{{ view.zones }}"
-  loop_control:
-    loop_var: zone
-  when: zone.type == 'master'
-  notify: Restart named

tasks/verify_zone_file.yaml

@@ -0,0 +1,13 @@
+---
+
+- name: "Read the last character of DNS zone: {{ zone.config.origin }}"
+  ansible.builtin.command:
+    cmd: "tail --bytes 1 {{ bind_config_directory + '/' + zone.file }}"
+  register: _bind9_zone_last_character
+  changed_when: _bind9_zone_last_character.rc == 0
+  failed_when: _bind9_zone_last_character.rc > 0
+
+- name: "Fail when the last character of DNS zone file is not a newline: {{ bind_config_directory + '/' + zone.file }}"
+  ansible.builtin.fail:
+    msg: "Last character of DNS zone file is not a newline: {{ bind_config_directory + '/' + zone.file }}"
+  when: _bind9_zone_last_character.stdout != ''

templates/etc/named/named.conf.options.j2

@@ -186,9 +186,24 @@ options {
 
   directory "{{ bind_config_directory }}";
 
-  dnssec-validation {{ 'yes' if bind9_options.dnssec_validation else 'no' }};
+  # This accepts expired signatures when verifying DNSSEC signatures. The default is no. Setting this option to yes
+  # leaves named vulnerable to replay attacks.
+  dnssec-accept-expired {{ "yes" if bind9_options.dnssec_accept_expired else "no" }};
 
-  # dump-file "/var/bind/named.dump";
+  # Enables DNSSEC validation in named.
+  #
+  # auto: If set to auto, DNSSEC validation is enabled and a default trust anchor for the DNS root zone is used. This
+  # trust anchor is provided as part of BIND and is kept up-to-date
+  #
+  # yes: If set to yes, DNSSEC validation is enabled, but a trust anchor must be manually configured using a
+  # trust-anchors statement (or the managed-keys or trusted-keys statements, both deprecated). If trust-anchors is not
+  # configured, it is a configuration error. If trust-anchors does not include a valid root key, then validation does
+  # not take place for names which are not covered by any of the configured trust anchors.
+  #
+  # no: If set to no, DNSSEC validation is disabled.
+  #
+  # https://bind9.readthedocs.io/en/latest/reference.html#namedconf-statement-dnssec-validation
+  dnssec-validation {{ bind9_options.dnssec_validation | default('auto') }};
 
 {% if bind9_options.forwarders is defined and bind9_options.forwarders | length > 0 %}
   forwarders {
@@ -231,6 +246,13 @@ options {
   };
 {% endif %}
 
+  # Indicates the directory where public and private DNSSEC key files are found.
+  #
+  # This is the directory where the public and private DNSSEC key files should be found when performing a dynamic update
+  # of secure zones, if different than the current working directory.
+  # https://bind9.readthedocs.io/en/latest/reference.html#namedconf-statement-key-directory
+  key-directory "{{ bind9_options.key_directory }}";
+
   # managed-keys-directory "/var/named/dynamic";
   # memstatistics-file "/var/bind/named.memstats";
   minimal-responses {{ bind9_options.minimal_responses }};

templates/etc/named/named.conf.views.j2

@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True (or False)", trim_blocks: "True (or False)"
+#jinja2: lstrip_blocks: True
 #
 # {{ ansible_managed }}
 #
@@ -13,7 +13,26 @@ view "{{ view.name }}" {
   };
 
 {% for zone in view.zones %}
-  zone "{{ zone.origin }}" {
+  zone "{{ zone.config.origin }}" {
+
+    # allow-notify applies to slave zones only and defines a match list,
+    # e.g. IP address(es), that are allowed to NOTIFY the slave in
+    # addition to those hosts defined in the masters statement. By
+    # default only the hosts of the masters statement may send NOTIFY
+    # messages.
+    #
+    # NOTE:
+    # - This statement may be used in a zone, view or a global options
+    #   clause.
+{% if zone.config.allow_notify is defined and zone.config.allow_notify | length > 0 %}
+    allow-notify {
+{% for entry in zone.config.allow_notify %}
+      {{ entry }};
+{% endfor %}
+    };
+{% else %}
+    # allow-notify {};
+{% endif %}
 
     # Hosts which are allowed to issue queries to the server. If not specified all
     # hosts are allowed to make queries (defaults to allow-query {any;};
@@ -21,9 +40,9 @@ view "{{ view.name }}" {
     # NOTE:
     # - The statements may be used in a zone, view or a global options
     #   clause.
-{% if zone.allow_query is defined and zone.allow_query | length > 0 %}
+{% if zone.config.allow_query is defined and zone.config.allow_query | length > 0 %}
     allow-query {
-{% for entry in zone.allow_query %}
+{% for entry in zone.config.allow_query %}
       {{ entry }};
 {% endfor %}
     };
@@ -40,9 +59,9 @@ view "{{ view.name }}" {
     # NOTE:
     # - The statements may be used in a zone, view or a global options
     #   clause.
-{% if zone.allow_query_on is defined and zone.allow_query_on | length > 0 %}
-    allow-query {
-{% for entry in zone.allow_query_on %}
+{% if zone.config.allow_query_on is defined and zone.config.allow_query_on | length > 0 %}
+    allow-query-on {
+{% for entry in zone.config.allow_query_on %}
       {{ entry }};
 {% endfor %}
     };
@@ -63,9 +82,9 @@ view "{{ view.name }}" {
     #
     # NOTE:
     # - This statement may be used in a zone, view or global options clause.
-{% if zone.allow_transfer is defined and zone.allow_transfer | length > 0 %}
+{% if zone.config.allow_transfer is defined and zone.config.allow_transfer | length > 0 %}
     allow-transfer {
-{% for entry in zone.allow_transfer %}
+{% for entry in zone.config.allow_transfer %}
       key {{ entry }};
 {% endfor %}
     };
@@ -86,9 +105,9 @@ view "{{ view.name }}" {
     #
     # NOTE:
     # - This statement may be used in a zone, view or an options clause.
-{% if zone.allow_update is defined and zone.allow_update | length > 0 %}
+{% if zone.config.allow_update is defined and zone.config.allow_update | length > 0 %}
     allow-update {
-{% for entry in zone.allow_update %}
+{% for entry in zone.config.allow_update %}
       key {{ entry }};
 {% endfor %}
     };
@@ -102,9 +121,9 @@ view "{{ view.name }}" {
     #
     # NOTE:
     # - This statement may be used in zone, view or an options clause.
-{% if zone.allow_update_forwarding is defined and zone.allow_update_forwarding | length > 0 %}
+{% if zone.config.allow_update_forwarding is defined and zone.config.allow_update_forwarding | length > 0 %}
     allow-update-forwarding {
-{% for entry in zone.allow_update_forwarding %}
+{% for entry in zone.config.allow_update_forwarding %}
       {{ entry }};
 {% endfor %}
     };
@@ -129,9 +148,9 @@ view "{{ view.name }}" {
     #   contact the Master, ffor whatever reason, the zone may be left with
     #   no effective Authoritative Name Servers.
 {% if zone.file is defined and zone.file | length > 0 and not zone.file.startswith('/') %}
-    file "{{ bind_config_directory }}/{{ zone.file }}";
+    file "{{ bind_config_directory }}/{{ zone.config.file }}";
 {% elif zone.file is defined and zone.file | length > 0 and zone.file.startswith('/')%}
-    file "{{ zone.file }}";
+    file "{{ zone.config.file }}";
 {% else %}
     # file "{{ bind_config_directory }}/...";
 {% endif %}
@@ -141,8 +160,8 @@ view "{{ view.name }}" {
     # forwarders first; if that does not answer the question, the server then
     # looks for the answer itself. If only is specified, the server only queries
     # the forwarders.
-{% if zone.forward is defined and zone.forward | length > 0 %}
-    forward {{ zone.forward }};
+{% if zone.config.forward is defined and zone.config.forward | length > 0 %}
+    forward {{ zone.config.forward }};
 {% else %}
     # forward first;
 {% endif %}
@@ -152,9 +171,9 @@ view "{{ view.name }}" {
     # associated with an optional port number and/or DSCP value, and a default
     # port number and DSCP value can be set for the entire list.
     # https://bind9.readthedocs.io/en/latest/reference.html#forwarding
-{% if zone.forwarders is defined and zone.forwarders | length > 0 %}
+{% if zone.config.forwarders is defined and zone.config.forwarders | length > 0 %}
     forwarders {
-{% for forwarder in zone.forwarders %}
+{% for forwarder in zone.config.forwarders %}
       {{ forwarder }};
 {% endfor %}
     };
@@ -164,9 +183,9 @@ view "{{ view.name }}" {
 
     # master servers
     # https://bind9.readthedocs.io/en/latest/manpages.html?highlight=masters#masters
-{% if zone.masters is defined and zone.masters | length > 0 %}
+{% if zone.config.masters is defined and zone.config.masters | length > 0 %}
     masters {
-{% for master in zone.masters %}
+{% for master in zone.config.masters %}
       {{ master.ip }} key {{ master.tsigkey}};
 {% endfor %}
     };
@@ -190,9 +209,9 @@ view "{{ view.name }}" {
     # NOTE:
     # - This statement may be specified in zone, view clauses or in a
     #   global options clause.
-{% if zone.notify is defined and zone.notify %}
+{% if zone.config.notify is defined and zone.config.notify %}
     notify yes;
-{% elif zone.notify is defined and not zone.notify %}
+{% elif zone.config.notify is defined and not zone.config.notify %}
     notify no;
 {% else %}
     # notify yes | no;
@@ -216,13 +235,13 @@ view "{{ view.name }}" {
     # is the current date in the form “YYYYMMDD”, followed by two
     # zeroes, unless the existing serial number is already greater than
     # or equal to that value, in which case it is incremented by one.
-{% if zone.serial_update_method is defined %}
-    serial-update-method {{ zone.serial_update_method }};
+{% if zone.config.serial_update_method is defined %}
+    serial-update-method {{ zone.config.serial_update_method }};
 {% else %}
     # serial-update-method [date | increment | unixtime ];
 {% endif %}
 
-    type {{ zone.type }};
+    type {{ zone.config.type }};
 
     # The update-policy clause allows more fine-grained control over which
     # updates are allowed. It specifies a set of rules, in which each rule
@@ -230,9 +249,9 @@ view "{{ view.name }}" {
     # updated by one or more identities. Identity is determined by the key that
     # signed the update request, using either TSIG or SIG(0).
     # https://bind9.readthedocs.io/en/v9_16_5/reference.html#dynamic-update-policies
-{% if zone.update_policies is defined and zone.update_policies | length > 0 %}
+{% if zone.config.update_policies is defined and zone.config.update_policies | length > 0 %}
     update-policy {
-{% for update_policy in zone.update_policies %}
+{% for update_policy in zone.config.update_policies %}
       {{ update_policy.action }} {{ update_policy.identity }} {{ update_policy.ruletype }} {{ update_policy.name | default('') }} {{ update_policy.types | default('') | join(' ') }};
 {% endfor %}
     };