diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces index 1b7837b..1fa317d 100644 --- a/Python/etc/network/interfaces +++ b/Python/etc/network/interfaces @@ -7,6 +7,11 @@ info["owner"] = "root" info["group"] = "root" info["perms"] = 0644 +import config.dns + +nameservers = ' '.join(config.dns.recursiv) +nameservers_adm = ' '.join(config.dns.recursiv_adm) + header(""" Les modifications locales sont a mettre dans le fichier /etc/network/interfaces.local @@ -29,8 +34,8 @@ iface %(interface)s inet static netmask 255.255.248.0 broadcast 138.231.143.255 gateway 138.231.136.4 - dns-nameservers 138.231.136.98 138.231.136.152 138.231.136.247 - dns-search crans.org""" % { 'interface': interface, 'ip': pubip() } + dns-nameservers %(nameservers)s + dns-search crans.org""" % { 'interface': interface, 'ip': pubip(), 'nameservers': nameservers } for line in additionnals: print " ", line @@ -44,9 +49,9 @@ iface %(interface)s inet static address %(ip)s network 138.231.144.0 netmask 255.255.248.0 - broadcast 138.231.148.255 - dns-nameservers 138.231.136.98 138.231.136.152 138.231.136.247 - dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip() } + broadcast 138.231.151.255 + dns-nameservers %(nameservers)s + dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip(), 'nameservers': nameservers } for line in additionnals: print " ", line @@ -60,8 +65,8 @@ iface %(interface)s inet static netmask 255.255.255.0 broadcast 10.231.136.255 mtu 1496 - dns-nameservers 10.231.136.98 10.231.136.152 10.231.136.247 - dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip() } + dns-nameservers %(nameservers)s + dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip(), 'nameservers': nameservers_adm } for line in additionnals: print " ", line