From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2019 18:33:25 +0000 (+0200)
Subject: Try to make mail_port really optional
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6c15ce09f0461a09d645497882c02e437bf658ec;p=mirror%2Fdsa-puppet.git

Try to make mail_port really optional
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 5eb492376..2843925f5 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -10,7 +10,6 @@
 # @param smarthost_port the port on which satellites send mail to the smarthost (needs to be the same on both sides)
 class exim (
   Optional[String] $smarthost,
-  Optional[Integer] $mail_port,
   Boolean $use_smarthost = true,
   Boolean $is_bugsmx = false,
   Boolean $is_mailrelay = false,
@@ -18,6 +17,7 @@ class exim (
   Boolean $is_packagesmaster = false,
   Boolean $is_packagesqamaster = false,
   Integer $smarthost_port = 587,
+  Optional[Integer] $mail_port = undef,
 ) {
   include exim::vdomain::setup
   include debian_org::mail_incoming_port