X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=dns-config;h=cc7b5e3a07365fd4884e659905ab40368f64cc06;hb=97afc1d7a102177b754e8823504837635272fded;hp=3941bbf520960ebcb32adc2a732e9ca635f42774;hpb=effaa2138be88157b2322de42fe9395694918acf;p=myplc.git

diff --git a/dns-config b/dns-config
index 3941bbf..cc7b5e3 100755
--- a/dns-config
+++ b/dns-config
@@ -56,27 +56,28 @@ def main():
     for node in GetNodes():
         nodes[node['node_id']] = node
 
-    nodenetwork_ids = set()
+    interface_ids = set()
     for node in nodes.values():
-        nodenetwork_ids.update(node['nodenetwork_ids'])
+        interface_ids.update(node['interface_ids'])
 
-    for nodenetwork in GetNodeNetworks(list(nodenetwork_ids)):
-        if not nodenetwork['ip']:
+    for interface in GetInterfaces(list(interface_ids)):
+        if not interface['ip']:
             continue
 
-        if nodenetwork['hostname']:
-            hostname = nodenetwork['hostname']
+        if interface['hostname']:
+            hostname = interface['hostname']
         else:
-            hostname = nodes[nodenetwork['node_id']]['hostname']
+            hostname = nodes[interface['node_id']]['hostname']
 
-        if hosts.has_key(nodenetwork['ip']):
-            if hostname not in hosts[nodenetwork['ip']]:
-                hosts[nodenetwork['ip']].append(hostname)
+        if hosts.has_key(interface['ip']):
+            if hostname not in hosts[interface['ip']]:
+                hosts[interface['ip']].append(hostname)
         else:
-            hosts[nodenetwork['ip']] = [hostname]
+            hosts[interface['ip']] = [hostname]
     
     # Write /etc/plc_hosts
     plc_hosts = open("/etc/plc_hosts", "w")
+    plc_hosts.write("# DO NOT EDIT; File is writen and removed by automatic scripts\n")
     for ip, hostnames in hosts.iteritems():
         plc_hosts.write(ip + "\t" + " ".join(hostnames) + "\n")
     plc_hosts.close()
@@ -92,6 +93,8 @@ def main():
 domain-needed
 bogus-priv
 addn-hosts=/etc/plc_hosts
+resolv-file=/etc/resolv.conf
+conf-dir=/etc/dnsmasq.d
 """.lstrip())
 
     # Reload dnsmasq