Changeset 10730 in genesis

Timestamp:

May 8, 2012, 10:13:26 PM (13 years ago)

Author:

rick

Message:

DNS name for external configured addresses.

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -1031 +1031 @@
     if datadump['nodetype'] in ['CNode', 'Hybrid']:
       wleiden_cname[datadump['nodename']] = fqdn
+ 
+    if datadump.has_key('rdr_host'):
+      remote_target = datadump['rdr_host']
+    elif datadump.has_key('remote_access') and datadump['remote_access']:
+      remote_target = datadump['remote_access'].split(':')[0]
+    else:
+      remote_target = None
+
+    if remote_target:
+      try:
+        parseaddr(remote_target)
+        wleiden_zone[datadump['nodename'] + '.gw'].append((remote_target, False))
+      except (IndexError, ValueError):
+        wleiden_cname[datadump['nodename'] + '.gw'] = remote_target + '.'
+
 
     wleiden_zone[fqdn].append((datadump['masterip'], True))
@@ -1175 +1190 @@
   for host,items in wleiden_zone.iteritems():
     for ip,reverse in items:
-      if valid_addr(ip):
+      if ip not in ['0.0.0.0']:
         f.write("%s.wleiden.net. IN A %s \n" % (host.lower(), ip))
   for source,dest in wleiden_cname.iteritems():
-    f.write("%s.wleiden.net. IN CNAME %s.wleiden.net.\n" % (source.lower(), dest.lower()))
+    dest = dest if dest.endswith('.') else dest + ".wleiden.net."
+    f.write("%s.wleiden.net. IN CNAME %s\n" % (source.lower(), dest.lower()))
   for source, dest in wleiden_raw.iteritems():
     f.write("%s.wleiden.net. %s\n" % (source, dest))