[dns] On utilise un dictionnaire pour les dns recursifs
This commit is contained in:
parent
f31d79e63f
commit
5e76ac1ad0
4 changed files with 13 additions and 13 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue