Allow type forwarded, thanks @BenWaller!

Relates #9
robertdebock · Mar 12, 2020 · e587bd6 · e587bd6
1 parent d564e68
commit e587bd6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -143,14 +143,7 @@ dns_zones:
         value: 127.0.0.1
 
   - name: forwarded.example.com
-    ns:
-      - name: dns1.forwarded.example.com.
-      - name: dns2.forwarded.example.com.
-    records:
-      - name: dns1
-        value: 127.0.0.1
-      - name: dns2
-        value: 127.0.0.1
+    type: forward
     dns_zone_forwarders:
       - 1.1.1.1
       - 8.8.8.8

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -72,14 +72,7 @@ dns_zones:
         value: 127.0.0.1
 
   - name: forwarded.example.com
-    ns:
-      - name: dns1.forwarded.example.com.
-      - name: dns2.forwarded.example.com.
-    records:
-      - name: dns1
-        value: 127.0.0.1
-      - name: dns2
-        value: 127.0.0.1
+    type: forward
     dns_zone_forwarders:
       - 1.1.1.1
       - 8.8.8.8

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -56,6 +56,9 @@
     src: zone.j2
     dest: "{{ dns_datadir }}/{{ item.name }}.conf"
   loop: "{{ dns_zones }}"
+  when:
+    - item.type is undefined or
+      item.type == "master"
   notify:
     reload zones
   loop_control:

diff --git a/templates/named.conf.j2 b/templates/named.conf.j2
@@ -57,8 +57,10 @@ zone "." {
 
 {% for zone in dns_zones %}
 zone "{{ zone.name }}" {
-  type master;
+  type {{ zone.type | default('master') }};
+{% if zone.type is not defined or zone.type == "master" %}
   file "{{ dns_datadir }}/{{ zone.name }}.conf";
+{% endif %}
 {% if zone.dns_zone_forwarders is defined %}
   forwarders {
 {% for zone_forwarder in zone.dns_zone_forwarders %}