X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=8916c096a20efe3c0cf9dbdb0944fd9783e0ab34;hb=8532689c735ba87e8c00161224e068c2ba06f640;hp=0157b1439ce72edcc1ecb3624860fa044b100c2b;hpb=bb3c419ae3fb9387d5e91cf1e0dc9b82d167c728;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 0157b1439..8916c096a 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -23,24 +23,12 @@ class exim::mx(
     notify => Service['exim4'],
   }
 
-  # MXs used as smarthosts
-  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)',
-  }
-  $autocertdir = hiera('paths.auto_certs_dir')
-  dnsextras::tlsa_record{ 'tlsa-submission':
-    zone     => 'debian.org',
-    certfile => "${autocertdir}/${::fqdn}.crt",
-    port     => 587,
-    hostname => $::fqdn,
-  }
   package { 'monitoring-plugins-standard':
     ensure => installed,
   }
+
+  ferm::rule::simple { 'dsa-smtp':
+    description => 'Allow smtp access from the world',
+    port        => '25',
+  }
 }