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

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 388370a7a..6be074edc 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,17 +7,42 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
-	include roles::pubsub::parameters
+  include exim::mailrelay
 
-	$rabbit_password = $roles::pubsub::parameters::rabbit_password
+  include roles::pubsub::parameters
 
-	roles::pubsub::config { 'emailvdomains':
-		key      => 'dsa-emailvdomains-receive',
-		exchange => dsa,
-		queue    => "email-${::fqdn}",
-		topic    => 'dsa.email.update',
-		vhost    => dsa,
-		username => $::fqdn,
-		password => $rabbit_password
-	}
+  $rabbit_password = $roles::pubsub::parameters::rabbit_password
+
+  roles::pubsub::config { 'emailvdomains':
+    key      => 'dsa-emailvdomains-receive',
+    exchange => dsa,
+    queue    => "email-${::fqdn}",
+    topic    => 'dsa.email.update',
+    vhost    => dsa,
+    username => $::fqdn,
+    password => $rabbit_password
+  }
+
+  # smtp firewalling setup
+  ###
+  @@ferm::rule::simple { "dsa-smtp-from-mailrelay-${::fqdn}":
+    tag         => 'smtp::server::to::mail-satellite',
+    description => 'Allow smtp access from a mailrelay',
+    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,
+  }
 }