X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=3909f9b7ed366e918ab3802517aee1b711de069a;hb=fc8a2e887766e10b6c33a00c547049d6bf38801c;hp=42b478392719ef8776969584239feae8ff1bc416;hpb=8c5e427d328f0f3f02952fcf8d512bb914ca9d6d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 42b478392..3909f9b7e 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"],
@@ -10,7 +13,7 @@ class exim::mx inherits exim {
           ;
         "/etc/exim4/exim_surbl.pl":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/exim_surbl.pl" ]
+          source  => [ "puppet:///exim/common/exim_surbl.pl" ],
           notify  => Exec["exim4 restart"]
           ;
     }
@@ -18,5 +21,17 @@ 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)"
+    }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: