X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Flists.pp;h=fe80ae4ced1dd257b15e67c4a600124862f785d9;hb=75dae331d9162c52bd10b706476f86e1e4d3c017;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..fe80ae4ce 100644
--- a/modules/roles/manifests/lists.pp
+++ b/modules/roles/manifests/lists.pp
@@ -1,13 +1,8 @@
 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,
+  }
 }