projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
By default unbound answers queries for ASN112 networks on its own. Teach it to behave.
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
2b84b4e
..
4dec93c
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-5,27
+5,28
@@
## Format:
## domain: hostname[::port] options
## example:
## Format:
## domain: hostname[::port] options
## example:
-## buildd.debian.org:
raff
.debian.org::587 byname
+## buildd.debian.org:
grieg
.debian.org::587 byname
<%=
<%=
-mxmatches = [
fqdn
]
+mxmatches = [
scope.lookupvar('::fqdn')
]
routes = []
extraroutes = []
routes = []
extraroutes = []
-case fqdn
-when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
+if scope.lookupvar('site::nodeinfo')['mailrelay']
mxmatches << 'mailout.debian.org'
extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
mxmatches << 'mailout.debian.org'
extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+ extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
-mxinfo.keys.sort.each do |host|
- mxinfo[host]['mXRecord'].each do |mx|
+scope.lookupvar('site::allnodeinfo').keys.sort.each do |host|
+ next unless scope.lookupvar('site::allnodeinfo')[host]['mXRecord']
+ scope.lookupvar('site::allnodeinfo')[host]['mXRecord'].each do |mx|
mxmatch = mxregex.match(mx)
if mxmatches.include?(mxmatch[1])
route = host + ":\t\t" + host
mxmatch = mxregex.match(mx)
if mxmatches.include?(mxmatch[1])
route = host + ":\t\t" + host
- if
localinfo.has_key?(host) and localinfo[host].has_key?('mail_port') and localinfo
[host]['mail_port'].to_s != ''
- route += "::" +
localinfo
[host]['mail_port'].to_s
+ if
scope.lookupvar('site::localinfo').has_key?(host) and scope.lookupvar('site::localinfo')[host].has_key?('mail_port') and scope.lookupvar('site::localinfo')
[host]['mail_port'].to_s != ''
+ route += "::" +
scope.lookupvar('site::localinfo')
[host]['mail_port'].to_s
end
routes << route
end
end
routes << route
end