X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Flists.pp;h=bd9c72a0974cc14167c508d508fa8991587c4840;hb=fa67a3c70b0ad6f46691ee1495dfa7f249143d52;hp=d1d9d237f27a4a545391540bbcf2cce6627d035a;hpb=ee173b8b353548a2a6a5ac1037f32174c26b8603;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/lists.pp b/modules/roles/manifests/lists.pp
index d1d9d237f..bd9c72a09 100644
--- a/modules/roles/manifests/lists.pp
+++ b/modules/roles/manifests/lists.pp
@@ -1,13 +1,13 @@
 class roles::lists {
-	ssl::service { 'lists.debian.org':
-		notify  => Exec['service apache2 reload'],
-		tlsaport => 0,
-	}
+  include apache2
 
-	dnsextras::tlsa_record{ 'tlsa-mailport':
-		zone     => 'debian.org',
-		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
-		port     => 25,
-		hostname => $::fqdn,
-	}
+  ssl::service { 'lists.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  ferm::rule::simple { 'dsa-smtp':
+    description => 'Allow smtp access from the world',
+    port        => '25',
+  }
 }