diff --git a/Python/etc/bind/named.conf.local b/Python/etc/bind/named.conf.local index b1dfc57..2975d82 100644 --- a/Python/etc/bind/named.conf.local +++ b/Python/etc/bind/named.conf.local @@ -81,7 +81,7 @@ if has("dns-recursif") and not has("dns-secondary-no-forward"): elif has("dns-forward-only"): @forward only; - print "forwarders { %s; };" % '; '.join(config.dns.recursiv_adm) + print "forwarders { %s; };" % '; '.join(config.dns.recursiv['adm']) @// anti SPAM @// Rajout pour generer le forward vers ariane pour la zone rbl-plus.mail-abuse.org --Nico 21/04/02 diff --git a/Python/etc/bind/named.conf.notify b/Python/etc/bind/named.conf.notify index 7c10aef..e6fcb9d 100644 --- a/Python/etc/bind/named.conf.notify +++ b/Python/etc/bind/named.conf.notify @@ -14,9 +14,12 @@ def notify(ips): print " also-notify { \n %s;\n };" % ';\n '.join(ips) - - +allowed = set() if has("dns-primary"): - notify(config.dns.slaves + config.dns.parents) -elif has("dns-tv"): - notify(config.dns.slaves_tv + config.dns.recursiv) + allowed = allowed.union(config.dns.slaves + config.dns.parents) +if has("dns-tv"): + allowed = allowed.union(config.dns.slaves_tv + config.dns.recursiv['adm']) +if allowed: + allowed = list(allowed) + allowed.sort() + notify(allowed) diff --git a/Python/etc/bind/named.conf.options b/Python/etc/bind/named.conf.options index cc56bba..d7e312e 100644 --- a/Python/etc/bind/named.conf.options +++ b/Python/etc/bind/named.conf.options @@ -57,7 +57,7 @@ if has("dns-primary") or has("dns-tv"): if has("dns-primary"): allowed = allowed.union(config.dns.slaves + config.dns.parents) if has("dns-tv"): - allowed = allowed.union(config.dns.slaves_tv + config.dns.recursiv_adm) + allowed = allowed.union(config.dns.slaves_tv + config.dns.recursiv['adm']) if allowed: allowed = list(allowed) allowed.sort() diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces index 1fa317d..0bc40dc 100644 --- a/Python/etc/network/interfaces +++ b/Python/etc/network/interfaces @@ -9,9 +9,6 @@ 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 @@ -35,7 +32,7 @@ iface %(interface)s inet static broadcast 138.231.143.255 gateway 138.231.136.4 dns-nameservers %(nameservers)s - dns-search crans.org""" % { 'interface': interface, 'ip': pubip(), 'nameservers': nameservers } + dns-search crans.org""" % { 'interface': interface, 'ip': pubip(), 'nameservers': ' '.join(config.dns.recursiv['fil']) } for line in additionnals: print " ", line @@ -51,7 +48,7 @@ iface %(interface)s inet static netmask 255.255.248.0 broadcast 138.231.151.255 dns-nameservers %(nameservers)s - dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip(), 'nameservers': nameservers } + dns-search wifi.crans.org""" % { 'interface': interface, 'ip': wifiip(), 'nameservers': ' '.join(config.dns.recursiv['wifi']) } for line in additionnals: print " ", line @@ -66,7 +63,7 @@ iface %(interface)s inet static broadcast 10.231.136.255 mtu 1496 dns-nameservers %(nameservers)s - dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip(), 'nameservers': nameservers_adm } + dns-search adm.crans.org""" % { 'interface': interface, 'ip': admip(), 'nameservers': ' '.join(config.dns.recursiv['adm']) } for line in additionnals: print " ", line