X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=8a81592eca96f0f1f449de4c8e384a5bb3d6e39e;hb=a3d4f91de193a1b0563037574d170b83abe1bef9;hp=2f1bfb64ee8e26f8101ca3f90f0f3e34b853fc30;hpb=2d4c7908233109e081de0e932ac3c7d8cf0ba4e5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 2f1bfb64e..8a81592ec 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -5,15 +5,15 @@ class exim::mx inherits exim {
     file {
         "/etc/exim4/ccTLD.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/ccTLD.txt" ]
+          source  => [ "puppet:///modules/exim/common/ccTLD.txt" ]
           ;
         "/etc/exim4/surbl_whitelist.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/surbl_whitelist.txt" ]
+          source  => [ "puppet:///modules/exim/common/surbl_whitelist.txt" ]
           ;
         "/etc/exim4/exim_surbl.pl":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/exim_surbl.pl" ],
+          source  => [ "puppet:///modules/exim/common/exim_surbl.pl" ],
           notify  => Exec["exim4 restart"]
           ;
     }
@@ -21,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: