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

diff --git a/modules/roles/manifests/lists.pp b/modules/roles/manifests/lists.pp
index d4c36077e..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'],
-		key => true,
-	}
+  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',
+  }
 }