From ee463f787d2a2024d880aab545f63122f9917df7 Mon Sep 17 00:00:00 2001
From: mortzu <mortzu@uni-bremen.de>
Date: Fri, 3 Apr 2015 15:40:26 +0200
Subject: [PATCH] Adapt hostnames to new vpn server setup, use NSD instead of
 BIND

---
 data/bremen.freifunk.net.zone | 3 ++-
 rzonegen.py                   | 5 +++--
 update-dns-nodes.sh           | 6 +++---
 zonegen.py                    | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/data/bremen.freifunk.net.zone b/data/bremen.freifunk.net.zone
index 4708de6..6e642f9 100644
--- a/data/bremen.freifunk.net.zone
+++ b/data/bremen.freifunk.net.zone
@@ -40,7 +40,8 @@ downloads			CNAME	www
 wiki				CNAME	www
 
 ; mesh stuff
-nodes				NS	vpn01.bremen.freifunk.net.
+nodes				NS	vpn02
+nodes				NS	vpn03
 
 node				A	10.196.0.127
 				AAAA	fd2f:5119:f2c::127
diff --git a/rzonegen.py b/rzonegen.py
index 78b34c8..547903f 100755
--- a/rzonegen.py
+++ b/rzonegen.py
@@ -28,7 +28,7 @@ if not domain.endswith("."):
     domain = domain + "."
 
 print("""$TTL 1h
-@       IN      SOA     vpn01.bremen.freifunk.net. noc.bremen.freifunk.net. (
+@       IN      SOA     vpn03.bremen.freifunk.net. noc.bremen.freifunk.net. (
         %s ; serial
         1h ; refresh
         30m ; retry
@@ -36,7 +36,8 @@ print("""$TTL 1h
         1h ; caching
         )
 
-                NS      vpn01.bremen.freifunk.net.
+                NS      vpn02.bremen.freifunk.net.
+                NS      vpn03.bremen.freifunk.net.
 """ % datetime.now().strftime("%Y%m%d%H%M"))
 
 for node in data.values():
diff --git a/update-dns-nodes.sh b/update-dns-nodes.sh
index 3547dba..4f8b6e1 100755
--- a/update-dns-nodes.sh
+++ b/update-dns-nodes.sh
@@ -55,8 +55,8 @@ if [ -z "$TMP_FILE" ]; then
 fi
 
 # names of zones
-ZONEFILE=/var/cache/bind/ffhb.nodes.zone
-RZONEFILE=/var/cache/bind/arpa.ip6.f.d.2.f.5.1.1.9.0.f.2.c.zone
+ZONEFILE=/var/lib/nsd/net.freifunk.bremen.nodes.zone
+RZONEFILE=/var/lib/nsd/arpa.ip6.f.d.2.f.5.1.1.9.0.f.2.c.zone
 
 function on_exit() {
   # remove tmp files
@@ -112,7 +112,7 @@ if rzonegen.py 0.0.0.0.c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa <"$TMP_FILE" >"${RZONEFI
 fi
 
 # reload nameserver
-rndc reload >/dev/null
+nsd-control reload > /dev/null
 
 # copy alfred file
 cp "$TMP_FILE" "$ALFRED_DATA_FILE"
diff --git a/zonegen.py b/zonegen.py
index 23fb2a0..2ab4edb 100755
--- a/zonegen.py
+++ b/zonegen.py
@@ -20,7 +20,7 @@ def str_to_domainlabel(s):
 data = json.load(sys.stdin)
 
 print("""$TTL 1h
-@       IN      SOA     vpn01.bremen.freifunk.net. noc.bremen.freifunk.net. (
+@       IN      SOA     vpn03.bremen.freifunk.net. noc.bremen.freifunk.net. (
         %s ; serial
         1h ; refresh
         30m ; retry
@@ -28,7 +28,8 @@ print("""$TTL 1h
         1h ; caching
         )
 
-                NS      vpn01.bremen.freifunk.net.
+                NS      vpn02.bremen.freifunk.net.
+                NS      vpn03.bremen.freifunk.net.
 
 """ % datetime.now().strftime("%Y%m%d%H%M"))