X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=d77d65c88dd66de2ca34df4afe1f004e4a27ba17;hb=b97f50b20f35f7f736d6c6a9ec80a98e1cf9dcb8;hp=41a071afccd9e91d1b270b4d8a2526299bd66dc8;hpb=b0c0ca5a8846526179ff9566f248405be011ef62;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 41a071afc..d77d65c88 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -13,12 +13,19 @@ module Puppet::Parser::Functions
         raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
       end
       nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+      nodeinfo['buildd'] = nodeinfo['ldap']['purpose'] && nodeinfo['ldap']['purpose'].include?('buildd')
+
+      if lookupvar('::mta') == 'exim4'
+        unless nodeinfo['heavy_exim']
+          nodeinfo['smarthost'] = 'mailout.debian.org'
+        end
+      end
 
       nodeinfo['misc'] = {}
-      fqdn = lookupvar('fqdn')
+      fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
-        v4ips = lookupvar('v4ips')
-        if v4ips
+        v4ips = lookupvar('::v4ips')
+        if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
           nodeinfo['misc']['v4addrs'] = v4ips.split(',')
 
           # find out if we are behind nat
@@ -26,8 +33,8 @@ module Puppet::Parser::Functions
           nodeinfo['misc']['natted'] = intersection.empty?
         end
 
-        v6ips = lookupvar('v6ips')
-        if v6ips and v6ips != "no"
+        v6ips = lookupvar('::v6ips')
+        if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
           nodeinfo['misc']['v6addrs'] = v6ips.split(',')
         end
       end