Generate the apache ACL for draghi's "restricted" repo (RT#7962)

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

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index b84b13f..6be074e 100644 (file)
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,6 +7,8 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
+  include exim::mailrelay
+
   include roles::pubsub::parameters
 
   $rabbit_password = $roles::pubsub::parameters::rabbit_password
@@ -24,9 +26,23 @@ class roles::mailrelay {
   # smtp firewalling setup
   ###
   @@ferm::rule::simple { "dsa-smtp-from-mailrelay-${::fqdn}":
-    tag         => 'smtp::server::from::mailrelay',
+    tag         => 'smtp::server::to::mail-satellite',
     description => 'Allow smtp access from a mailrelay',
-    port        => '25',
+    port        => '7', # will be overwritten on collection
     saddr       => $base::public_addresses,
   }
+
+  ferm::rule::simple { 'submission-from-satellites':
+    target => 'submission',
+    port   => 'submission',
+  }
+  Ferm::Rule::Simple <<| tag == 'smtp::server::submission::to::mail-relay' |>>
+
+  $autocertdir = hiera('paths.auto_certs_dir')
+  dnsextras::tlsa_record{ 'tlsa-submission':
+    zone     => 'debian.org',
+    certfile => "${autocertdir}/${::fqdn}.crt",
+    port     => 587,
+    hostname => $::fqdn,
+  }
 }