Changeset 851

Timestamp:

Aug 3, 2008, 9:35:24 PM (16 years ago)

Author:

y_z

Message:

• sipb_xen_database -> invirt.database
• use invirt.config in dnsserver.py

Location:

trunk/packages/sipb-xen-dns

Files:

• code/dnsserver.py (modified) (6 diffs)
• config.todo (deleted)
• debian/changelog (modified) (1 diff)

trunk/packages/sipb-xen-dns/code/dnsserver.py

@@ -7 +7 @@
 from twisted.python import failure
 
-import sipb_xen_database
+from invirt.config import structs as config
+import invirt.database
 import psycopg2
 import sqlalchemy
@@ -17 +18 @@
     soa = None
 
-    def __init__(self, domains, database=None):
+    def __init__(self, domains=None, database=None):
         common.ResolverBase.__init__(self)
         if database is not None:
-            sipb_xen_database.connect(database)
-        self.domains = domains
-        self.soa = dns.Record_SOA(mname='ns1.xvm.mit.edu', 
-                                  rname='xvm.mit.edu',
+            invirt.database.connect(database)
+        else:
+            invirt.database.connect()
+        if domains is not None:
+            self.domains = domains
+        else:
+            self.domains = config.dns.domains
+        ns = config.dns.nameservers[0]
+        self.soa = dns.Record_SOA(mname=ns.hostname,
+                                  rname=config.dns.contact.replace('@','.',1),
                                   serial=1, refresh=3600, retry=900,
                                   expire=3600000, minimum=21600, ttl=3600)
-        self.ns = dns.Record_NS(name='ns1.xvm.mit.edu', ttl=3600)
-        record = dns.Record_A(address='18.181.0.62', ttl=3600)
-        self.ns1 = dns.RRHeader('ns1.xvm.mit.edu', dns.A, dns.IN,
+        self.ns = dns.Record_NS(name=ns.hostname, ttl=3600)
+        record = dns.Record_A(address=ns.ip, ttl=3600)
+        self.ns1 = dns.RRHeader(ns.hostname, dns.A, dns.IN,
                                 3600, record, auth=True)
 
@@ -46 +53 @@
 
     def _lookup_unsafe(self, name, cls, type, timeout):
-        sipb_xen_database.clear_cache()
+        invirt.database.clear_cache()
         
         ttl = 900
@@ -68 +75 @@
             if not host:
                 if type in (dns.A, dns.ALL_RECORDS):
-                    record = dns.Record_A('18.181.0.62', ttl)
+                    record = dns.Record_A(config.dns.nameservers[0].ip, ttl)
                     results.append(dns.RRHeader(name, dns.A, dns.IN, 
                                                 ttl, record, auth=True))
@@ -80 +87 @@
             else:
                 if host:
-                    value = sipb_xen_database.Machine.get_by(name=host)
+                    value = invirt.database.Machine.get_by(name=host)
                     if value is None or not value.nics:
                         return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
@@ -102 +109 @@
 
 if '__main__' == __name__:
-    resolver = DatabaseAuthority(['servers.csail.mit.edu',
-                                  'xvm.mit.edu'],
-                                 'postgres://sipb-xen@sipb-xen-dev/sipb_xen')
+    resolver = DatabaseAuthority()
 
     verbosity = 0

trunk/packages/sipb-xen-dns/debian/changelog

@@ +1 @@
+sipb-xen-dns (1.02) unstable; urgency=low
+
+  * sipb_xen_database -> invirt.database
+  * use invirt.config in dnsserver.py
+
+ -- Yang Zhang <y_z@mit.edu>  Sun,  3 Aug 2008 19:18:40 -0400
+
 sipb-xen-dns (1.01) unstable; urgency=low