X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=899f1d999904b842de5213d5c0ec6a6a59cf8f57;hb=281a027d9d2bb22a59292a6b72229efe74c1a4d2;hp=21a194edaa708b46cea755ad8291c8f7d8ed1899;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb index 21a194eda..899f1d999 100644 --- a/modules/exim/templates/manualroute.erb +++ b/modules/exim/templates/manualroute.erb @@ -8,11 +8,11 @@ ## buildd.debian.org: grieg.debian.org::587 byname <%= -mxmatches = [ scope.lookupvar('::fqdn') ] +mxmatches = [ @fqdn ] routes = [] extraroutes = [] -if scope.function_has_role('mailrelay') +if scope.function_has_role(['mailrelay']) mxmatches << 'mailout.debian.org' mxmatches << 'INCOMING-MX' extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]