X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmailrelay.pp;h=388370a7a4918f6c06487d024278baf328427cf0;hb=20837932686b93b71481bb8ee38c902d06b25fa2;hp=c6abab28a76e349a84f6d425d0194963848b166f;hpb=7e5b0998aa9eebbcf6992944cbdd1af623029ab1;p=dsa-puppet.git

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index c6abab28..388370a7 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -1,8 +1,23 @@
+# = 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,
-		maildir    => '/org/admin.debian.org/mail/',
-		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
 	}
 }