summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-04-22 17:09:19 +0200
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-04-22 17:09:19 +0200
commit0aaf0528ab1f1ecb6f5960cd0c45ec5045f7dd0f (patch)
tree2986323cc5508ed80da683a63609911aa72465ef
parent16cfdc4fde9bd3c9ff491c9dc4944da8916cafc4 (diff)
downloadplaybooks-ansible-0aaf0528ab1f1ecb6f5960cd0c45ec5045f7dd0f.tar.gz
playbooks-ansible-0aaf0528ab1f1ecb6f5960cd0c45ec5045f7dd0f.tar.xz
playbooks-ansible-0aaf0528ab1f1ecb6f5960cd0c45ec5045f7dd0f.zip
Use loops for dns slaves in named.conf
-rw-r--r--roles/dnsserver/templates/named.conf.j221
-rw-r--r--roles/dnsserver/vars/main.yml10
2 files changed, 11 insertions, 20 deletions
diff --git a/roles/dnsserver/templates/named.conf.j2 b/roles/dnsserver/templates/named.conf.j2
index e9e14e1..daeffe3 100644
--- a/roles/dnsserver/templates/named.conf.j2
+++ b/roles/dnsserver/templates/named.conf.j2
@@ -14,8 +14,9 @@ acl "whitelist-recursion" {
{% if is_dnsmaster is defined %}
acl "transferlist" {
- {{ slave2_ipv6 }};
- {{ slave3_ipv6 }};
+{% for item in slavelist %}
+ {{ '{{' }} {{ item }} {{ '}}' }};
+{% endfor %}
};
{% endif %}
@@ -115,21 +116,11 @@ logging {
{% block keys %}{% endblock %}
{% if is_dnsmaster is defined %}
-server {{ slave2_ipv4 }} {
- keys { Forwarder; };
-};
-
-server {{ slave2_ipv6 }} {
- keys { Forwarder; };
-};
-
-server {{ slave3_ipv4 }} {
- keys { Forwarder; };
-};
-
-server {{ slave3_ipv6 }} {
+{% for item in slavelist %}
+server {{ item }} {
keys { Forwarder; };
};
+{% endfor %}
{% endif %}
{% if is_dnsmaster is not defined %}
server {{ master_ipv4 }} {
diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml
index 98d08c5..dde2ed9 100644
--- a/roles/dnsserver/vars/main.yml
+++ b/roles/dnsserver/vars/main.yml
@@ -1,12 +1,12 @@
master_ipv4: 82.247.103.117
master_ipv6: 2a01:e35:2f76:7750::4
-slave2_ipv4: 176.31.191.26
-slave2_ipv6: 2001:41d0:52:100::f2
-
-slave3_ipv4: 51.15.179.153
-slave3_ipv6: "2001:bc8:3fec:f00:7ea::"
+slavelist:
+ - 176.31.191.26
+ - 2001:41d0:52:100::f2
+ - 51.15.179.153
+ - "2001:bc8:3fec:f00:7ea::"
whitelist:
- localhost