remove smtp_sources from ferm's me.conf, retire old-style heavy_{exim,postfix} roles

[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 384c7d9..f31b723 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -14,16 +14,6 @@ module Puppet::Parser::Functions
       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