summaryrefslogtreecommitdiff
path: root/puppet/modules/site_postfix
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-02-23 14:15:17 -0500
committerMicah <micah@leap.se>2016-02-23 21:12:51 -0500
commitcff07b7b3642c0d53e02cb0885f24250037b8d15 (patch)
tree3479acf5b9991111cea69ad303641fc66c0711ca /puppet/modules/site_postfix
parentfd599945751a489a638fadace51c871f59346a46 (diff)
Update opendkim platform pieces to match leap-cli.
Change-Id: I9c8f9c9c3ee7cd89f013cbb08397377522ed5a4a
Diffstat (limited to 'puppet/modules/site_postfix')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 2ea54d0a..3230d4f0 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -67,8 +67,12 @@ class site_postfix::mx {
# alias map
'local_recipient_maps':
value => '$alias_maps';
+ # setup clamav and opendkim on smtpd
'smtpd_milters':
- value => 'unix:/run/clamav/milter.ctl,unix:/var/run/opendkim/opendkim.sock';
+ value => 'unix:/run/clamav/milter.ctl,inet:localhost:8891';
+ # setup opendkim for smtp (non-smtpd) outgoing mail
+ 'non_smtpd_milters':
+ value => 'inet:localhost:8891';
'milter_default_action':
value => 'accept';
# Make sure that the right values are set, these could be set to different
@@ -96,6 +100,7 @@ class site_postfix::mx {
include ::site_postfix::mx::rewrite_openpgp_header
include ::site_postfix::mx::received_anon
include ::clamav
+ include ::opendkim
include ::postfwd
# greater verbosity for debugging, take out for production