Adding smtps rules at firewall::router::mail

diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp
index 3fc15daa077ebbf6ab9df263cee8ae07742d2f15..29d43a5f5063cf8d4fbe4fb8d19b273103b63952 100644 (file)
--- a/manifests/subsystems/firewall/router.pp
+++ b/manifests/subsystems/firewall/router.pp
@@ -220,6 +220,27 @@ class firewall::router::mail($destination, $zone = 'loc', $originaldest = $ipadd
     ratelimit       => '-',
     order           => '1003',
   }
+
+  shorewall::rule { 'mail-5':
+    action          => 'DNAT',
+    source          => 'net',
+    destination     => "$zone:$destination:587",
+    proto           => 'tcp',
+    destinationport => '587',
+    ratelimit       => '-',
+    order           => '1004',
+  }
+
+  shorewall::rule { 'mail-6':
+    action          => 'DNAT',
+    source          => '$FW',
+    destination     => "$zone:$destination:587",
+    proto           => 'tcp',
+    destinationport => '587',
+    originaldest    => "$originaldest",
+    ratelimit       => '-',
+    order           => '1005',
+  }
 }
 
 define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'loc',