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

[mirror/dsa-puppet.git] / modules / ferm / templates / me.conf.erb

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")
 %>