server/mirrormanager/model.py | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
New commits:
commit c5f9e8312c1fd444db0a1131e4c0a19a5b6c7076
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Tue Jan 18 11:00:20 2011 -0600
drop CategoryDnsMX as unneeded, set default SOA values
diff --git a/server/mirrormanager/model.py b/server/mirrormanager/model.py
index d57c32d..b6db8ed 100644
--- a/server/mirrormanager/model.py
+++ b/server/mirrormanager/model.py
@@ -752,10 +752,13 @@ class CategoryDNS(SQLObject):
cacheValues = False
category = ForeignKey('Category')
soa_master = UnicodeCol()
- soa_hostmaster = UnicodeCol()
+ soa_responsible = UnicodeCol()
soa_serial = BigIntCol()
- cname_ttl = IntCol()
- mxs = MultipleJoin('CategoryDnsMx')
+ soa_refresh = IntCol(default=(60*20))
+ soa_retry = IntCol(default=(60*10))
+ soa_expire = IntCol(default=864000)
+ soa_minimum = IntCol(default=600)
+ cname_ttl = IntCol(default=3600)
nss = MultipleJoin('CategoryDnsNs')
@@ -766,13 +769,6 @@ class CategoryDNS(SQLObject):
for ns in self.nss:
ns.destroySelf()
-class CategoryDnsMx(SQLObject):
- class sqlmeta:
- cacheValues = False
- category = ForeignKey('CategoryDNS')
- mx = UnicodeCol()
- priority = IntCol()
-
class CategoryDnsNS(SQLObject):
class sqlmeta:
Show replies by date