From 50f921241ee4f892a1ebc4a0b723fec7ef3c6ec6 Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Thu, 6 Dec 2018 19:20:04 +0100
Subject: Fix template in dnsserver role

---
 roles/dnsserver/templates/named.conf.j2 | 8 +++++---
 roles/dnsserver/templates/rndc.key.j2   | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/roles/dnsserver/templates/named.conf.j2 b/roles/dnsserver/templates/named.conf.j2
index 5d95298..d3cb657 100644
--- a/roles/dnsserver/templates/named.conf.j2
+++ b/roles/dnsserver/templates/named.conf.j2
@@ -57,9 +57,11 @@ options {
 
 	pid-file "/run/named/named.pid";
 	session-keyfile "/run/named/session.key";
+{% if ansible_distribution == "Fedora" %}
 
 	/* https://fedoraproject.org/wiki/Changes/CryptoPolicy */
 	include "/etc/crypto-policies/back-ends/bind.config";
+{% endif -%}
 };
 
 logging {
@@ -117,9 +119,9 @@ logging {
 };
 
 {% for key in keylist %}
-key "{{ key.0 }}" {
-      algorithm {{ key.2 }};
-      secret "{{ key.1 }}";
+key "{{ key.name }}" {
+      algorithm {{ key.algo }};
+      secret "{{ key.secret }}";
 };
 {% endfor %}
 
diff --git a/roles/dnsserver/templates/rndc.key.j2 b/roles/dnsserver/templates/rndc.key.j2
index 2caad4e..169133f 100644
--- a/roles/dnsserver/templates/rndc.key.j2
+++ b/roles/dnsserver/templates/rndc.key.j2
@@ -1,4 +1,6 @@
-key "rndc-key" {
-      algorithm {{ keylist.rndc.algo }};
-      secret "{{ keylist.rndc.secret }}";
+{% for key in keylist %}
+key "{{ key.name }}" {
+      algorithm {{ key.algo }};
+      secret "{{ key.secret }}";
 };
+{% endfor %}
-- 
cgit