Merge pull request #12 from Freifunk-Troisdorf/dns-integration

Dns integration

files/fftdf/db.fftdf

@@ -0,0 +1,22 @@
+;; db.fftdf
+;; Forwardlookupzone für .fftdf
+;;
+$TTL 600
+@       IN      SOA     fftdf. root.fftdf. (
+                        2015584543      ; Serial
+                                8H      ; Refresh
+                                2H      ; Retry
+                                4W      ; Expire
+                                3H )    ; NX (TTL Negativ Cache)
+
+@                               IN      NS      {{ sn_hostname }}.infra.fftdf.
+                                IN      A       {{ sn_mesh_ipv4 }}
+                                IN      AAAA	{{ sn_mesh_ipv6 }}
+localhost				IN		A    	127.0.0.1
+						IN  	AAAA    ::1
+nextnode				IN  	A       10.188.0.1
+						IN  	AAAA    2a03:2260:121::1
+;; Update Servers
+update1.infra			IN      AAAA    2a03:2260:121::22
+update2.infra			IN      AAAA    2a03:2260:121::23
+update3.infra			IN      AAAA    2a03:2260:121::24

files/fftdf/fftdf.conf

@@ -0,0 +1,6 @@
+// Zone declarations for Freifunk Troisdorf
+
+zone "fftdf" {
+  type master;
+  file "/etc/bind/fftdf/db.fftdf";
+};

files/named.conf.local

@@ -0,0 +1,10 @@
+//
+// Do any local configuration here
+//
+
+// Consider adding the 1918 zones here, if they are not used in your
+// organization
+//include "/etc/bind/zones.rfc1918";
+
+// Include Freifunk Troisdorf (fftdf) zones
+include "/etc/bind/fftdf/fftdf.conf";

install.sn.yml

@@ -253,13 +253,17 @@
     - name: SSH authorized_keys
       copy: src=./files/{{ item }} dest=/root/.ssh owner=root group=root mode=0400
       with_items: authorized_keys
-#    - name: Copy secondary zone file
-#      copy: src=./files/{{ item }} dest=/etc/bind owner=root group=bind mode=644
-#      with_items: bind_zone_fftdf
     - name: Bind9, activate fftdf zone
-      lineinfile: dest=/etc/bind/named.conf line='include "/etc/bind/named.conf.fftdf";' state=present
+      lineinfile: dest=/etc/bind/named.conf line='include "/etc/bind/fftdf/fftdf.conf";' state=present
     - name: Copy option template
       template: src=./files/named.conf.options.j2 dest=/etc/bind/named.conf.options owner=root group=bind mode=644
+    - name: Create fftdf directory
+      file: path=/etc/bind/fftdf state=directory
+    - name: Copy FFTDF Zones
+      copy: src=./files/fftdf/{{ item }} dest=/etc/bind/fftdf/{{ item }} owner=root group=bind mode=644
+      with_items: 
+        - fftdf.conf
+        - db.fftdf
     - name: Copy radvd config template
       template: src=./files/radvd.conf.j2 dest=/etc/radvd.conf owner=radvd group=root mode=0444
     - name: Interface configuration with ffrl gre tunnel