X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=3522f84d06b4a51cdebbfd59e6e9f1d735b22b69;hb=a68ac2a388955f929b49474adfc31c2bf985258b;hp=10f246ac65a251f981a10ea72da18133c6e0d049;hpb=95845a5ccf79baa45874907f2fa1df0c7a44461c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 10f246ac6..3522f84d0 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,14 +5,14 @@
 ## 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 = []
 
-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" ]