X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=320c7ff18603b3b07110a7b419b36e144ae25f18;hb=6ce61aa23c7e455ca90b28263f99472d28b12d5f;hp=83e56f38a7dc5d299687aaa731d148cce5c88408;hpb=de8c1d4a9a45a2b30ab58e062251fbe9f722fe1b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 83e56f38a..320c7ff18 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,6 @@
 # our exim class
-# @param smarthost host to relay through (if unset)
+# @param use_smarthost use the smarthost
+# @param smarthost host to relay through (if set and use_smarthost)
 # @param is_bugsmx this system handles bugs.debian.org
 # @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
 # @param is_rtmaster this system handles rt.debian.org
@@ -7,6 +8,7 @@
 # @param is_packagesqamaster this system handles packages.qa.debian.org
 # @param smarthost_port the port on which satellites send mail to the smarthost
 class exim (
+  Boolean $use_smarthost = true,
   Optional[String] $smarthost,
   Boolean $is_bugsmx = false,
   Boolean $is_mailrelay = false,
@@ -18,8 +20,12 @@ class exim (
   include exim::vdomain::setup
   include debian_org::mail_incoming_port
 
-  if $smarthost and $smarthost != '' {
+  if $use_smarthost {
     $heavy = false
+
+    if ! smarthost {
+      fail('No smarthost set but use_smarthost is true')
+    }
   } else {
     $heavy = true
   }