X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmailrelay.pp;h=b84b13fbf31d147e7d72ef18476aea485c3f76ca;hb=28f397a5c62193d2a7ba3f48a2d5a118a7d9a90a;hp=5ef8f9608dfe952cccf245fc6a8dd5e98efbfb08;hpb=cdc5eddb2cb3f9905e90c3093a61e0bf5ecc1195;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 5ef8f9608..b84b13fbf 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -1,7 +1,32 @@
+# = Class: roles::mailrelay
+#
+# Setup for mailrelay hosts
+#
+# == Sample Usage:
+#
+#   include roles::mailrelay
+#
 class roles::mailrelay {
-	exim::vdomain { 'admin.debian.org':
-		user       => mail_admin,
-		group      => mail_admin,
-		alias_file => 'puppet:///modules/exim/admin.debian.org/aliases'
-	}
+  include roles::pubsub::parameters
+
+  $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::from::mailrelay',
+    description => 'Allow smtp access from a mailrelay',
+    port        => '25',
+    saddr       => $base::public_addresses,
+  }
 }