retire mail_port config from local.yaml

[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 6bd95df..f070aab 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -40,31 +40,6 @@ if should_restrict then
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
-
-       if scope.function_has_role(['debian_mirror']) or
-          scope.function_has_role(['syncproxy']) then
-               ssh4allowed << '$HOST_SYNCPROXY_V4'
-               ssh6allowed << '$HOST_SYNCPROXY_V6'
-       end
-       if scope.function_has_role(['security_mirror']) or
-          scope.function_has_role(['syncproxy']) then
-               ssh4allowed << '$HOST_SECMASTER_V4'
-               ssh6allowed << '$HOST_SECMASTER_V6'
-       end
-       if scope.function_has_role(['historical_mirror']) then
-               ssh4allowed << '$HOST_ARCHIVEMASTER_V4'
-               ssh6allowed << '$HOST_ARCHIVEMASTER_V6'
-       end
-       if scope.function_has_role(['syncproxy']) then
-               ssh4allowed << '$HOST_FTPMASTER_V4'
-               ssh6allowed << '$HOST_FTPMASTER_V6'
-               ssh4allowed << '$HOST_PORTSMASTER_V4'
-               ssh6allowed << '$HOST_PORTSMASTER_V6'
-       end
-       if scope.function_has_role(['debug_mirror']) then
-               ssh4allowed << '$HOST_FTPMASTER_V4'
-               ssh6allowed << '$HOST_FTPMASTER_V6'
-       end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
@@ -73,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")
 %>