From 87c276c55bcbfab65c97e2e9cf4f16f6531b34f3 Mon Sep 17 00:00:00 2001
From: Daniel Akulenok <dak@keepit.com>
Date: Tue, 14 May 2024 13:47:03 +0200
Subject: [PATCH] Demacro http

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

diff --git a/templates/named.conf.dyndb.j2 b/templates/named.conf.dyndb.j2
index ee73c02..822ec52 100644
--- a/templates/named.conf.dyndb.j2
+++ b/templates/named.conf.dyndb.j2
@@ -1,8 +1,6 @@
-{% macro dyndb(dyndbs) %}
-{% for dyndb in dyndbs if dyndbs is iterable %}
+{% for dyndb in item.dyndb if item.dyndb is iterable %}
 dyndb {{ dyndb.name }} "{{ dyndb.driver }}" {
 {% filter indent(bind9_config_indent, true) %}
 {{ functions.simple_item_list(dyndb.parameters) -}}
 {% endfilter %}};
 {% endfor %}
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/named.conf.generator.j2 b/templates/named.conf.generator.j2
index dd36dd4..890c7c6 100644
--- a/templates/named.conf.generator.j2
+++ b/templates/named.conf.generator.j2
@@ -27,8 +27,7 @@ options {
 {% include 'named.conf.dnssec-policy.j2' %}
 {% endif %}
 {% if item.dyndb is defined and item.dyndb %}
-{% from 'named.conf.dyndb.j2' import dyndb with context %}
-{{ dyndb(item.dyndb) }}
+{% include 'named.conf.dyndb.j2' %}
 {% endif %}
 {% if item.http is defined and item.http %}
 {% from 'named.conf.http.j2' import http with context %}