summaryrefslogtreecommitdiff
path: root/puppet/modules/site_postfix
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2016-06-07 09:39:57 +0000
committerVarac <varac@leap.se>2016-06-07 09:39:57 +0000
commitf8979f8ce035ce618a6b4ff69e7a833f9a0b05ed (patch)
tree56e01bde6bc9a9348221dcc31dad30eb95d5a076 /puppet/modules/site_postfix
parent5b2cb9a14bf5735e61e148c21496677c8458bd63 (diff)
parent954a746947b7395fe3252e9df371da30546ee762 (diff)
Merge branch '0.8.x' into '0.8.x'
Fix opendkim milter location (#8163). The unix socket method for connecting to the milter was incorrectly reverted, this puts it back to how it should be. Change-Id: Ifde669c920a249c782f577a112f4d45e60a889a2 See merge request !4
Diffstat (limited to 'puppet/modules/site_postfix')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index c269946b..e743118e 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -69,10 +69,10 @@ class site_postfix::mx {
value => '$alias_maps';
# setup clamav and opendkim on smtpd
'smtpd_milters':
- value => 'unix:/run/clamav/milter.ctl,inet:localhost:8891';
+ value => 'unix:/run/clamav/milter.ctl,unix:/run/opendkim/opendkim.sock';
# setup opendkim for smtp (non-smtpd) outgoing mail
'non_smtpd_milters':
- value => 'inet:localhost:8891';
+ value => 'unix:/run/opendkim/opendkim.sock';
'milter_default_action':
value => 'accept';
# Make sure that the right values are set, these could be set to different