projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding security-master's certificate
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
10f246a
..
899f1d9
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-8,11
+8,11
@@
## buildd.debian.org: grieg.debian.org::587 byname
<%=
## buildd.debian.org: grieg.debian.org::587 byname
<%=
-mxmatches = [
scope.lookupvar('::fqdn')
]
+mxmatches = [
@fqdn
]
routes = []
extraroutes = []
routes = []
extraroutes = []
-if scope.
lookupvar('site::nodeinfo')['mailrelay']
+if scope.
function_has_role(['mailrelay'])
mxmatches << 'mailout.debian.org'
mxmatches << 'INCOMING-MX'
extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
mxmatches << 'mailout.debian.org'
mxmatches << 'INCOMING-MX'
extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]