Retire debian_org::mail_incoming_port which did the default firewalling for the mail...

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
deleted file mode 100644 (file)
index 720e14f..0000000
--- a/modules/debian_org/manifests/mail_incoming_port.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class debian_org::mail_incoming_port {
-       case getfromhash($deprecated::nodeinfo, 'mail_port') {
-               Numeric: { $mail_port = sprintf("%d", getfromhash($deprecated::nodeinfo, 'mail_port')) }
-               /^(\d+)$/: { $mail_port = $1 }
-               default: { $mail_port = '25' }
-       }
-
-       ferm::rule { 'dsa-mail':
-               description => 'Allow SMTP',
-               rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
-       }
-
-       ferm::rule { 'dsa-mail-v6':
-               description => 'Allow SMTP',
-               domain      => 'ip6',
-               rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
-       }
-}

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 2843925..adbaf4d 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -20,7 +20,6 @@ class exim (
   Optional[Integer] $mail_port = undef,
 ) {
   include exim::vdomain::setup
-  include debian_org::mail_incoming_port
 
   if $use_smarthost {
     $heavy = false

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index 000522d..4d5c31d 100644 (file)
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -22,8 +22,6 @@ class postfix(
     ensure => running
   }
 
-  include debian_org::mail_incoming_port
-
   munin::check { 'ps_exim4':       ensure => absent }
   munin::check { 'exim_mailqueue': ensure => absent }
   munin::check { 'exim_mailstats': ensure => absent }