From 4577a40db92d7bb7af2ef9a1e8c66521aa3d7676 Mon Sep 17 00:00:00 2001
From: Daniel Akulenok <dak@keepit.com>
Date: Tue, 14 May 2024 14:26:36 +0200
Subject: [PATCH] Demacro server

---
 templates/named.conf.generator.j2 | 3 +--
 templates/named.conf.server.j2    | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/templates/named.conf.generator.j2 b/templates/named.conf.generator.j2
index 16d74ff..ef48120 100644
--- a/templates/named.conf.generator.j2
+++ b/templates/named.conf.generator.j2
@@ -42,8 +42,7 @@ options {
 {% include 'named.conf.parental-agents.j2' %}
 {% endif %}
 {% if item.server is defined and item.server %}
-{% from 'named.conf.server.j2' import server with context %}
-{{ server(item.server) }}
+{% include  'named.conf.server.j2' %}
 {% endif %}
 {% if item.statistics_channels is defined and item.statistics_channels %}
 {% from 'named.conf.statistics-channels.j2' import statistics_channels with context %}
diff --git a/templates/named.conf.server.j2 b/templates/named.conf.server.j2
index c5d24f8..aba7d46 100644
--- a/templates/named.conf.server.j2
+++ b/templates/named.conf.server.j2
@@ -1,5 +1,4 @@
-{% macro server(servers) %}
-{% for server in servers if servers is iterable %}
+{% for server in item.server if item.server is iterable %}
 server {{ server.prefix }} {
 {% filter indent(bind9_config_indent, true) %}
 {% if server.transfer_source is defined and server.transfer_source is mapping %}
@@ -54,4 +53,3 @@ query-source
 {{ (functions.boolean_option('send-cookie', server.send_cookie) + '\n') if server.send_cookie is defined -}}
 {% endfilter %}};
 {% endfor %}
-{% endmacro %}
\ No newline at end of file