Changeset 10209 in genesis


Ignore:
Timestamp:
Mar 17, 2012, 7:24:37 PM (13 years ago)
Author:
richardvm
Message:

adding proxies anywat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r10198 r10209  
    518518  output += """\
    519519search wleiden.net
    520 # Try local (cache) first
    521 nameserver 127.0.0.1
    522520"""
    523521  if datadump['nodetype'] == 'Proxy':
    524522    output += """\
     523# Try local (cache) first
     524nameserver 127.0.0.1
    525525nameserver 8.8.8.8   # Google Public NameServer
    526526nameserver 8.8.4.4   # Google Public NameServer
    527527"""
    528528  elif datadump['nodetype'] == 'Hybrid':
     529    for proxy in get_proxylist():
     530      proxy_ip = get_yaml(proxy)['masterip']
     531      output += "nameserver %-15s # %s\n" % (proxy_ip, proxy)
    529532    output += """\
    530 nameserver 172.16.4.46 # Sunny
    531533nameserver 8.8.8.8   # Google Public NameServer
    532534nameserver 8.8.4.4   # Google Public NameServer
     
    534536  else:
    535537    output += """\
     538# Try local (cache) first
     539nameserver 127.0.0.1
     540
    536541# Proxies are recursive nameservers
    537542# needs to be in resolv.conf for dnsmasq as well
Note: See TracChangeset for help on using the changeset viewer.