X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=ebcbd852706e03d5be4b8c7741d132fd03daa217;hb=fe5c5a3adcbd8921dd4cf1f1e7430b4a5618e0b7;hp=1e77aa925a999d7c2d9f78955fac3a3d6c4c13a6;hpb=6223d29ea525ff1ef4626af124280d5f10fea746;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 1e77aa925..ebcbd8527 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,4 +1,7 @@
 class exim::mx inherits exim {
+    include clamav
+    include postgrey
+
     file {
         "/etc/exim4/ccTLD.txt":
           require => Package["exim4-daemon-heavy"],
@@ -18,5 +21,14 @@ class exim::mx inherits exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    @ferm::rule { "dsa-exim-submission":
+            description     => "Allow SMTP",
+            rule            => "&SERVICE_RANGE(tcp, submission, \$SMTP_SOURCES)"
+    }
+    @ferm::rule { "dsa-exim-v6-submission":
+            description     => "Allow SMTP",
+            domain          => "ip6",
+            rule            => "&SERVICE_RANGE(tcp, submission, \$SMTP_V6_SOURCES)"
+    }
 }