From: Stephen Gran <steve@lobefin.net>
Date: Sat, 6 Mar 2010 12:53:53 +0000 (+0000)
Subject: Revert "first stab at opening firewall for actual mail port"
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f91d5f3fba8edeaf60ad92422da768dad8d92def;p=dsa-puppet.git

Revert "first stab at opening firewall for actual mail port"

This reverts commit 8aa9460c4f37da95c931dd25eb2b3ab0512f6afd.
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index f245eab1..956cdc09 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -156,15 +156,14 @@ class exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
-    $mail_port = case extractnodeinfo($nodeinfo, 'mail_port')
     @ferm::rule { "dsa-exim":
             description     => "Allow SMTP",
-            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
+            rule            => "&SERVICE_RANGE(tcp, smtp, \$SMTP_SOURCES)"
     }
     @ferm::rule { "dsa-exim-v6":
             description     => "Allow SMTP",
             domain          => "ip6",
-            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
+            rule            => "&SERVICE_RANGE(tcp, smtp, \$SMTP_V6_SOURCES)"
     }
     # Do we actually want this?  I'm only doing it because it's harmless
     # and makes the logs quiet.  There are better ways of making logs quiet,