X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=3a30975e5597470f86cacde0d7dc0a89ba897658;hb=e143e95a9bd27ba77fb02aa8e02e665a0ada6382;hp=bf7fd5ebfe7b0d0ae9f2e223a94392fa69f11ba3;hpb=e0c4da9d3bc8bbf97f1839f36ce2abf3fb0e3c7c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index bf7fd5ebf..3a30975e5 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -18,6 +18,12 @@ class exim::mx(
   file { '/etc/exim4/surbl_whitelist.txt':
     source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
   }
+  file { '/etc/exim4/two-level-tlds':
+    source => 'puppet:///modules/exim/common/two-level-tlds',
+  }
+  file { '/etc/exim4/three-level-tlds':
+    source => 'puppet:///modules/exim/common/three-level-tlds',
+  }
   file { '/etc/exim4/exim_surbl.pl':
     source => 'puppet:///modules/exim/common/exim_surbl.pl',
     notify => Service['exim4'],
@@ -26,4 +32,9 @@ class exim::mx(
   package { 'monitoring-plugins-standard':
     ensure => installed,
   }
+
+  ferm::rule::simple { 'dsa-smtp':
+    description => 'Allow smtp access from the world',
+    port        => '25',
+  }
 }