From e8a31a30d67a050678bc9ba1bd5fa551f9c08241 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 11:40:55 +0200
Subject: [PATCH] Retire debian_org::mail_incoming_port which did the default
 firewalling for the mail ports

---
 .../debian_org/manifests/mail_incoming_port.pp | 18 ------------------
 modules/exim/manifests/init.pp                 |  1 -
 modules/postfix/manifests/init.pp              |  2 --
 3 files changed, 21 deletions(-)
 delete mode 100644 modules/debian_org/manifests/mail_incoming_port.pp

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
deleted file mode 100644
index 720e14fbe..000000000
--- 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 2843925f5..adbaf4d47 100644
--- 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 000522d6e..4d5c31d12 100644
--- 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 }
-- 
2.20.1