Have the qa and packages.qa roles declare their exim virtualdomain

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

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index a888531..2fba6a6 100644 (file)
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,7 +7,7 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
-  include exim::mx
+  include exim::mailrelay
 
   include roles::pubsub::parameters
 
@@ -28,7 +28,7 @@ class roles::mailrelay {
   @@ferm::rule::simple { "dsa-smtp-from-mailrelay-${::fqdn}":
     tag         => 'smtp::server::from::mailrelay',
     description => 'Allow smtp access from a mailrelay',
-    port        => '25',
+    port        => '7', # will be overwritten on collection
     saddr       => $base::public_addresses,
   }
 }