Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / exim / templates / manualroute.erb

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 70cefe9..2965913 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -22,14 +22,14 @@ if scope.function_has_role(['mailrelay'])
 end
 
 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|
+scope.lookupvar('deprecated::allnodeinfo').keys.sort.each do |host|
+  next unless scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord']
+  scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord'].each do |mx|
     mxmatch = mxregex.match(mx)
     if mxmatches.include?(mxmatch[1])
       route = host + ":\t\t" + host
-      if scope.lookupvar('site::localinfo').has_key?(host) and scope.lookupvar('site::localinfo')[host].has_key?('mail_port') and scope.lookupvar('site::localinfo')[host]['mail_port'].to_s != ''
-        route += "::" + scope.lookupvar('site::localinfo')[host]['mail_port'].to_s
+      if scope.lookupvar('deprecated::localinfo').has_key?(host) and scope.lookupvar('site::localinfo')[host].has_key?('mail_port') and scope.lookupvar('site::localinfo')[host]['mail_port'].to_s != ''
+        route += "::" + scope.lookupvar('deprecated::localinfo')[host]['mail_port'].to_s
       end
       routes << route
     end