Changeset 10468 in genesis

Timestamp:

Apr 13, 2012, 3:30:36 AM (13 years ago)

Author:

rick

Message:

Make resolv.conf template more pretty. While here fix the hybrid setup for resolvers.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -672 +672 @@
 def generate_resolv_conf(datadump):
   """ Generate configuration file '/etc/resolv.conf' """
-  output = generate_header("#");
-  output += """\
+  # XXX: This should properly going to be an datastructure soon
+  datadump['autogen_header'] = generate_header("#")
+  datadump['autogen_edge_nameservers'] = ''
+  for host in get_proxylist():
+    hostdump = get_yaml(host)
+    datadump['autogen_edge_nameservers'] += "nameserver %(masterip)-15s # %(autogen_realname)s\n" % hostdump
+  for host in get_hybridlist():
+    hostdump = get_yaml(host)
+    if hostdump['service_proxy'] or hostdump['service_ileiden']:
+      datadump['autogen_edge_nameservers'] += "nameserver %(masterip)-15s # %(autogen_realname)s\n" % hostdump
+
+  return Template("""\
+{{ autogen_header }}
 search wleiden.net
-"""
-  if datadump['nodetype'] == 'Proxy':
-    output += """\
-# try local (cache) first
+
+# Try local (cache) first
 nameserver 127.0.0.1
+
+{% if service_proxy or service_ileiden or nodetype == 'Proxy' -%}
 nameserver 8.8.8.8   # Google Public NameServer
 nameserver 8.8.4.4   # Google Public NameServer
-"""
-  elif datadump['nodetype'] == 'Hybrid':
-    output += """\
-# try local (cache) first
-nameserver 127.0.0.1
-"""
-    for proxy in get_proxylist():
-      proxy_ip = get_yaml(proxy)['masterip']
-      output += "nameserver %-15s # %s\n" % (proxy_ip, proxy)
-    output += """\
-nameserver 8.8.8.8   # Google Public NameServer
-nameserver 8.8.4.4   # Google Public NameServer
-"""
-  else:
-    output += """\
-# Try local (cache) first
-nameserver 127.0.0.1
-
-# Proxies are recursive nameservers
-# needs to be in resolv.conf for dnsmasq as well
-""" % datadump
-    for proxy in get_proxylist():
-      proxy_ip = get_yaml(proxy)['masterip']
-      output += "nameserver %-15s # %s\n" % (proxy_ip, proxy)
-
-  return output
+{% else -%}
+{{ autogen_edge_nameservers }}
+{% endif -%}
+""").render(datadump)
+
+
 
 def generate_motd(datadump):