X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=f31b723c2dae63bc5bbda8e7ad4a3562445efb59;hb=acc06f8a3b65391b44bbb3b56b17a18bab966c22;hp=c7af8ae6f4a256987459c45949c15cd3ec873316;hpb=b2a6f14054fb5d39f29be46e49cb456fb5f43b5b;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 c7af8ae6f..f31b723c2 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -11,20 +11,9 @@ module Puppet::Parser::Functions
         raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
       end
       nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber']])
-      nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
       nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
       nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host'))
 
-      if lookupvar('::mta') == 'exim4'
-        unless nodeinfo['heavy_exim']
-          nodeinfo['smarthost'] = 'mailout.debian.org'
-        end
-      elsif lookupvar('::mta') == 'postfix'
-        unless nodeinfo['heavy_postfix']
-          nodeinfo['smarthost'] = 'mailout.debian.org'
-        end
-      end
-
       nodeinfo['misc'] = {}
       fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
@@ -53,7 +42,7 @@ module Puppet::Parser::Functions
         nodeinfo['misc']['v6_ldap'] = nodeinfo['ldap']['ipHostNumber'].select { |x| IPAddr.new(x).ipv6? }
       end
 
-      ns = call_function('hiera',['nameservers'])
+      ns = call_function('hiera',['resolv::nameservers'])
       allow_dns_q = call_function('hiera',['allow_dns_query'])
       if ns.empty?
         # no nameservers known for this hoster