Let's try a nice SURBL lookup for the PTS mail

[mirror/dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 159b869..64e94db 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -29,23 +29,28 @@ module Puppet::Parser::Functions
       end
     end
 
-    results['mail_port'] = ''
+    results['mail_port']      = ''
     results['smarthost']      = ''
+    results['heavy_exim']     = ""
     results['smarthost_port'] = 587
-    results['reservedaddrs'] = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
+    results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
 
     if yaml.has_key?('mail_port') and yaml['mail_port'].has_key?(host)
       results['mail_port'] = yaml['mail_port'][host]
     end
 
     if yaml.has_key?('need_smarthost') and yaml['need_smarthost'].include?(host)
-      results['smarthost']      = "mailout.debian.org"
+      results['smarthost']     = "mailout.debian.org"
     end
 
     if yaml.has_key?('reservedaddrs') and yaml['reservedaddrs'].has_key?(host)
       results['reservedaddrs'] = yaml['reservedaddrs'][host]
     end
 
+    if yaml.has_key?('heavy_exim') and yaml['heavy_exim'].include?(host)
+      results['heavy_exim']    = "true"
+    end
+
     ldap = LDAP::Conn.new('db.debian.org')
 
     results['ldap'] = []