X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmailrelay.pp;h=6be074edcc01aec823f3cdbaf62cc5def2bf4cd3;hb=fa67a3c70b0ad6f46691ee1495dfa7f249143d52;hp=a3812d98830d03eb76eebb5fdc0e7fd5e1e9ab83;hpb=c1af2d12fed391d080ca4ae29845e963dec677b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index a3812d988..6be074edc 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,9 +7,7 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
-  class { 'exim::mx':
-    is_mailrelay => true,
-  }
+  include exim::mailrelay
 
   include roles::pubsub::parameters
 
@@ -28,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,
+  }
 }