summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-04-12 09:30:44 -0400
committerMicah <micah@leap.se>2016-04-12 09:30:44 -0400
commitbac2f60e22a3c6ba5580c74a194fda982fb2e2ab (patch)
tree279e9782679e9cd5776997fa91d940518009cb7c
parent2164f660ba9d80dd4c54a178962a98297596d444 (diff)
In order for postfix to access the opendkim milter socket, we need tocitest_jessie
remove the chroot option for the cleanup service. (#8020) See e97a9d3800b173375a630e18e4b1aa0894eb96e1 for opendkim implementation. Change-Id: I2742650965e61273fb804ebe9ce3f9bd38796582
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 7837f415..2e735fc4 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -92,6 +92,13 @@ class site_postfix::mx {
value => 'enforce';
}
+ # Make sure that the cleanup serivce is not chrooted, otherwise it cannot
+ # access the opendkim milter socket (#8020)
+ exec { 'unset_cleanup_chroot':
+ command => '/usr/sbin/postconf -F "cleanup/unix/chroot=n"'
+ onlyif => '/usr/sbin/postconf -h -F "cleanup/unix/chroot" | egrep -q ^n'
+ }
+
include ::site_postfix::mx::smtpd_checks
include ::site_postfix::mx::checks
include ::site_postfix::mx::smtp_tls