Changeset 2037 for trunk

Timestamp:

Jan 30, 2009, 8:38:36 PM (16 years ago)

Author:

broder

Message:

The DNS server shouldn't error if dns.zone_files isn't set in the config.

Location:

trunk/packages/invirt-dns

Files:

• debian/changelog (modified) (1 diff)
• invirt-dns (modified) (2 diffs)

trunk/packages/invirt-dns/debian/changelog

@@ +1 @@
+invirt-dns (0.0.9) unstable; urgency=low
+
+  * Don't error if dns.zone_files isn't set in the config.
+
+ -- Evan Broder <broder@mit.edu>  Fri, 30 Jan 2009 20:09:35 -0500
+
 invirt-dns (0.0.8) unstable; urgency=low
 

trunk/packages/invirt-dns/invirt-dns

@@ -8 +8 @@
 from twisted.python import failure
 
+from invirt.common import InvirtConfigError
 from invirt.config import structs as config
 import invirt.database
@@ -170 +171 @@
 if '__main__' == __name__:
     resolvers = []
-    for zone in config.dns.zone_files:
-        for origin in config.dns.domains:
-            r = QuotingBindAuthority(zone)
-            # This sucks, but if I want a generic zone file, I have to
-            # reload the information by hand
-            r.origin = origin
-            lines = open(zone).readlines()
-            lines = r.collapseContinuations(r.stripComments(lines))
-            r.parseLines(lines)
-            
-            resolvers.append(r)
+    try:
+        for zone in config.dns.zone_files:
+            for origin in config.dns.domains:
+                r = QuotingBindAuthority(zone)
+                # This sucks, but if I want a generic zone file, I have to
+                # reload the information by hand
+                r.origin = origin
+                lines = open(zone).readlines()
+                lines = r.collapseContinuations(r.stripComments(lines))
+                r.parseLines(lines)
+                
+                resolvers.append(r)
+    except InvirtConfigError:
+        # Don't care if zone_files isn't defined
+        pass
     resolvers.append(DatabaseAuthority())