X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmailrelay.pp;h=2fba6a6aab751ca413b763d26e6533b982772344;hb=5bdfb10702fc3322b473233f33113427e26aebf9;hp=a888531e179090aef536ee2ebde40340c0ae98c3;hpb=368e147f10b8e748f7e171a15568a94d79599039;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index a888531e1..2fba6a6aa 100644
--- 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,
   }
 }