From 95845a5ccf79baa45874907f2fa1df0c7a44461c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 7 Jun 2013 19:11:41 +0200 Subject: [PATCH] Accept INCOMING-MX as ldap mxrecord entry for exim's manualroute --- modules/exim/templates/manualroute.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb index 4dec93c2..10f246ac 100644 --- a/modules/exim/templates/manualroute.erb +++ b/modules/exim/templates/manualroute.erb @@ -14,11 +14,12 @@ extraroutes = [] if scope.lookupvar('site::nodeinfo')['mailrelay'] mxmatches << 'mailout.debian.org' + mxmatches << 'INCOMING-MX' extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ] extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org" end -mxregex = Regexp.new('^\d+\s+(.*)\.$') +mxregex = Regexp.new('^\d+\s+(.*?)\.?$') 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| -- 2.39.2