From 63dc193ff79206d6d4754024db70a84a4cd4cc67 Mon Sep 17 00:00:00 2001
From: mortzu <mortzu@uni-bremen.de>
Date: Tue, 30 Dec 2014 10:54:56 +0100
Subject: [PATCH 1/2] (r)zongen.py: Fix maximum label length

---
 rzonegen.py | 2 +-
 zonegen.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rzonegen.py b/rzonegen.py
index 72f8351..f3759dc 100755
--- a/rzonegen.py
+++ b/rzonegen.py
@@ -12,7 +12,7 @@ def str_to_domainlabel(s):
     label = re.sub("^-*", "", label)
     label = re.sub("-*$", "", label)
 
-    if not re.match("^[a-zA-Z][a-zA-Z0-9-]*[a-zA-Z0-9]$", label):
+    if not re.match("^[a-zA-Z][a-zA-Z0-9-]{,61}[a-zA-Z0-9]$", label):
         raise RuntimeError("Not convertable to a domain label: %s" % s)
     return label
 
diff --git a/zonegen.py b/zonegen.py
index 0573c2f..3184871 100755
--- a/zonegen.py
+++ b/zonegen.py
@@ -12,7 +12,7 @@ def str_to_domainlabel(s):
     label = re.sub("^-*", "", label)
     label = re.sub("-*$", "", label)
 
-    if not re.match("^[a-zA-Z][a-zA-Z0-9-]*[a-zA-Z0-9]$", label):
+    if not re.match("^[a-zA-Z][a-zA-Z0-9-]{,61}[a-zA-Z0-9]$", label):
         raise RuntimeError("Not convertable to a domain label: %s" % s)
 
     return label

From a99d503fcb436fe859781ae77879ad869a499e11 Mon Sep 17 00:00:00 2001
From: mortzu <mortzu@uni-bremen.de>
Date: Tue, 30 Dec 2014 11:15:03 +0100
Subject: [PATCH 2/2] (r)zonegen.py: Switched to public names for NS and SOA

---
 rzonegen.py | 4 ++--
 zonegen.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rzonegen.py b/rzonegen.py
index f3759dc..23a3980 100755
--- a/rzonegen.py
+++ b/rzonegen.py
@@ -40,7 +40,7 @@ if not domain.endswith("."):
     domain = domain + "."
 
 print("""$TTL 1h
-@       IN      SOA     ns.ffhb. liste.bremen.freifunk.net. (
+@       IN      SOA     vpn01.bremen.freifunk.net. noc.bremen.freifunk.net. (
         %s ; serial
         1h ; refresh
         30m ; retry
@@ -48,7 +48,7 @@ print("""$TTL 1h
         1h ; caching
         )
 
-@		NS      ns01.ffhb.
+                NS      vpn01.bremen.freifunk.net.
 """ % datetime.now().strftime("%Y%m%d%H%M"))
 
 for node in data.values():
diff --git a/zonegen.py b/zonegen.py
index 3184871..b45b67c 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     ns.ffhb. liste.bremen.freifunk.net. (
+@       IN      SOA     vpn01.bremen.freifunk.net. noc.bremen.freifunk.net. (
         %s ; serial
         1h ; refresh
         30m ; retry
@@ -28,7 +28,7 @@ print """$TTL 1h
         1h ; caching
         )
 
-                NS      ns.ffhb.
+                NS      vpn01.bremen.freifunk.net.
 
 """ % datetime.now().strftime("%Y%m%d%H%M")