From 5d0562cfa4d381c4819e88bb6eb825a84083693b Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Thu, 17 Dec 2015 15:51:21 -0500
Subject: Make sure values that might get set incorrectly, due to preseed or
 debconf selections, are set correctly (#7478)

Change-Id: I3bd261fd6fe27bbf10b8994ffff9f8b7be5b9de0
---
 puppet/modules/site_postfix/manifests/mx.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'puppet')

diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 75378480..d456baf3 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -71,6 +71,15 @@ class site_postfix::mx {
       value => 'unix:/run/clamav/milter.ctl,unix:/var/run/opendkim/opendkim.sock';
     'milter_default_action':
       value => 'accept';
+    # Make sure that the right values are set, these could be set to different
+    # things on install, depending on preseed or debconf options
+    # selected (see #7478)
+    'relay_transport':
+      value => 'relay';
+    'default_transport':
+      value => 'smtp';
+    'mailbox_command':
+      value => '';
   }
 
   include site_postfix::mx::smtpd_checks
-- 
cgit v1.2.3