use the right value

[mirror/dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index deb07d9..6c32a71 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -13,11 +13,18 @@ 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'].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')
+        v4ips = lookupvar('::v4ips')
         if v4ips
           nodeinfo['misc']['v4addrs'] = v4ips.split(',')
 
@@ -26,7 +33,7 @@ module Puppet::Parser::Functions
           nodeinfo['misc']['natted'] = intersection.empty?
         end
 
-        v6ips = lookupvar('v6ips')
+        v6ips = lookupvar('::v6ips')
         if v6ips and v6ips != ""
           nodeinfo['misc']['v6addrs'] = v6ips.split(',')
         end