nm.d.o no longer needs access to projectb on bmdb1

[mirror/dsa-puppet.git] / modules / roles / manifests / lists.pp

diff --git a/modules/roles/manifests/lists.pp b/modules/roles/manifests/lists.pp
index d1d9d23..bd9c72a 100644 (file)
--- 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',
+  }
 }