From 115564ff9f1c903a4b344d45e8ab681a71b2a1e0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 21 Dec 2012 16:51:20 -0200
Subject: Enabling smtps port at firewall::vserver::mail

---
 manifests/subsystems/firewall/vserver.pp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/manifests/subsystems/firewall/vserver.pp b/manifests/subsystems/firewall/vserver.pp
index c244e09..4415952 100644
--- a/manifests/subsystems/firewall/vserver.pp
+++ b/manifests/subsystems/firewall/vserver.pp
@@ -218,6 +218,27 @@ class firewall::vserver::mail($destination, $zone = 'fw') {
     ratelimit       => "$firewall_ssl_ratelimit",
     order           => '1003',
   }
+
+  shorewall::rule { 'mail-5':
+    action          => 'DNAT',
+    source          => 'net',
+    destination     => "$zone:$destination:587",
+    proto           => 'tcp',
+    destinationport => '587',
+    ratelimit       => "$firewall_ssl_ratelimit",
+    order           => '1004',
+  }
+
+  shorewall::rule { 'mail-6':
+    action          => 'DNAT',
+    source          => '$FW',
+    destination     => "$zone:$destination:587",
+    proto           => 'tcp',
+    destinationport => '587',
+    originaldest    => "$ipaddress",
+    ratelimit       => "$firewall_ssl_ratelimit",
+    order           => '1005',
+  }
 }
 
 define firewall::vserver::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
-- 
cgit v1.2.3