From: Stephen Gran <steve@lobefin.net>
Date: Sat, 6 Mar 2010 12:57:43 +0000 (+0000)
Subject: let's see if this works
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=444848fc45ad05e08cbe50fa7f5ee9eeb4faeed9;p=dsa-puppet.git

let's see if this works

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 956cdc09..171e453f 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -156,14 +156,20 @@ class exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+
+    case extractnodeinfo($nodeinfo, 'mail_port') {
+      /^(\d+)$/: { $mail_port = $1 }
+      default: { $mail_port = 'smtp' }
+    }
+
     @ferm::rule { "dsa-exim":
             description     => "Allow SMTP",
-            rule            => "&SERVICE_RANGE(tcp, smtp, \$SMTP_SOURCES)"
+            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
     }
     @ferm::rule { "dsa-exim-v6":
             description     => "Allow SMTP",
             domain          => "ip6",
-            rule            => "&SERVICE_RANGE(tcp, smtp, \$SMTP_V6_SOURCES)"
+            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$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,