summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2015-12-18 11:14:49 -0500
committerMicah <micah@leap.se>2015-12-18 11:14:49 -0500
commit72f7df9b499cb78dcb72c8daa7521ec4cfc425a4 (patch)
tree94e6207da9d1dcfe9c6ea83ad6c7087fb6da0903 /puppet/modules
parentee7007de216c3ae4b2b15a613a60fd3b6d712fd5 (diff)
parent5d0562cfa4d381c4819e88bb6eb825a84083693b (diff)
Merge branch 'purge_postfix_config' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp9
1 files changed, 9 insertions, 0 deletions
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