move exim vs. postfix, heavy vs. not, into hiera

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

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 388370a..a888531 100644 (file)
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,17 +7,28 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
-       include roles::pubsub::parameters
+  include exim::mx
 
-       $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::from::mailrelay',
+    description => 'Allow smtp access from a mailrelay',
+    port        => '25',
+    saddr       => $base::public_addresses,
+  }
 }