Version 2010-01-13 13:04

M  src/hostinfo/dhcpd.py
M  src/hostinfo/named.py

src/hostinfo/dhcpd.py

@@ -147,8 +147,8 @@ def emit_subnet(tree, n, dhcphost, kickstart):
     #
     # Emit dynamic hosts
     #
-    result += "  default-lease-time 604800; # One week\n"
-    result += "  max-lease-time 604800;\n"
+    result += "  default-lease-time 14400; # 4 hours\n"
+    result += "  max-lease-time 86400; # 1 day\n"
     dk = dynamic.keys()
     dk.sort()
     min = 0

src/hostinfo/named.py

@@ -126,6 +126,12 @@ def forward(tree, domain):
                 host[i.name[1:]] = "A       %s" % i.ip[0]
                 for a in i._alias_:
                     host[a.name[0]] = "CNAME   %s" % i.name[1:]
+                for s in i._srv_:
+                    port = int(s.port[0] or 0)
+                    priority = int(s.priority[0] or 0)
+                    weight = int(s.weight[0] or 0)
+                    host[s.name[0]] = "SRV     %d %d %d %s" % (
+                        priority, weight, port, s.name[1:])
 
     for c in domain._cname_:
         # Emit cnames defined in subnet
@@ -139,7 +145,7 @@ def forward(tree, domain):
     hk = host.keys()
     hk.sort()
     for h in hk:
-        result += "%-16sIN      %s\n" % (h, host[h])
+        result += "%-18s IN      %s\n" % (h, host[h])
 
     return result