projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bacula::client -- support present/absent
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
21a194e
..
70cefe9
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-5,18
+5,20
@@
## Format:
## domain: hostname[::port] options
## example:
## Format:
## domain: hostname[::port] options
## example:
-## buildd.debian.org:
grieg
.debian.org::587 byname
+## buildd.debian.org:
foobar
.debian.org::587 byname
<%=
<%=
-mxmatches = [
scope.lookupvar('::fqdn')
]
+mxmatches = [
@fqdn
]
routes = []
extraroutes = []
routes = []
extraroutes = []
-if scope.function_has_role(
'mailrelay'
)
+if scope.function_has_role(
['mailrelay']
)
mxmatches << 'mailout.debian.org'
mxmatches << 'INCOMING-MX'
mxmatches << 'mailout.debian.org'
mxmatches << 'INCOMING-MX'
- extraroutes = [
"keyring.debian.org:\t\tkaufmann.debian.org"
]
+ extraroutes = [ ]
extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
+ extraroutes << "tracker.debian.org:\t\tticharich.debian.org"
+ extraroutes << "salsa.debian.org:\t\tgodard.debian.org"
end
mxregex = Regexp.new('^\d+\s+(.*?)\.?$')
end
mxregex = Regexp.new('^\d+\s+(.*?)\.?$')