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

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index 002ac31..35a1916 100644 (file)
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -110,23 +110,6 @@ footer:
   #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 host_settings:
-  heavy_postfix:
-    - bendel.debian.org
-  heavy_exim:
-    # mail front-ends
-    - mailly.debian.org
-    - muffat.debian.org
-    # other mail receivers
-    - buxtehude.debian.org
-    - draghi.debian.org
-    - master.debian.org
-    - nono.debian.org
-    - picconi.debian.org
-    - pinel.debian.org
-    - quantz.debian.org
-    - reger.debian.org
-    - vento.debian.org
-    - wuiet.debian.org
   mail_port:
     klecker.debian.org: 2025
     new-klecker.debian.org: 2025

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 829d71a..f070aab 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -48,21 +48,5 @@ out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
 out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"
 
 
-
-
-smtp4allowed = []
-smtp6allowed = []
-
-if not nodeinfo['smarthost'].empty?
-  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
-  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
-end
-
-smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::/0'
-
-out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
-out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
-
 out.join("\n")
 %>

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

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index 5839b75..8ae486d 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -24,8 +24,6 @@ module Puppet::Parser::Functions
       end
 
       results['mail_port']      = ''
-      results['smarthost']      = ''
-      results['heavy_exim']     = ''
 
       if yaml['host_settings'].kind_of?(Hash)
         yaml['host_settings'].each_pair do |property, values|