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

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