diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-03-01 00:35:19 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-03-01 00:35:19 -0500 |
| commit | 403eff22ea1aba10f37a764b5500c46ce2528010 (patch) | |
| tree | c9cb3c87553cf76f3087701a4a944d97e44b5883 /modules/mail | |
| parent | daa51678ad7885d5f40e56f76c65f476ad44cf50 (diff) | |
| download | puppet-tozt-403eff22ea1aba10f37a764b5500c46ce2528010.tar.gz puppet-tozt-403eff22ea1aba10f37a764b5500c46ce2528010.zip | |
change the format in rspamd too
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/files/dovecot.conf | 1 | ||||
| -rw-r--r-- | modules/mail/files/milter_headers.conf | 5 | ||||
| -rw-r--r-- | modules/mail/manifests/mailu.pp | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/modules/mail/files/dovecot.conf b/modules/mail/files/dovecot.conf index ee99136..d6421d7 100644 --- a/modules/mail/files/dovecot.conf +++ b/modules/mail/files/dovecot.conf @@ -1,3 +1,4 @@ plugin { sieve_spamtest_status_type = score + sieve_spamtest_status_header = X-Spam-Status: [[:alnum:]]+, score=(-?[[:digit:]]+\.[[:digit:]]) } diff --git a/modules/mail/files/milter_headers.conf b/modules/mail/files/milter_headers.conf new file mode 100644 index 0000000..9ff81da --- /dev/null +++ b/modules/mail/files/milter_headers.conf @@ -0,0 +1,5 @@ +authenticated_headers = ["authentication-results"]; +skip_local = false; +skip_authenticated = false; + +use = ["x-spamd-result", "x-spam-status", "authentication-results"]; diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index 8697222..2dce24f 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -66,6 +66,13 @@ class mail::mailu { source => "puppet:///modules/mail/dovecot.conf", require => File["/media/persistent/overrides"], notify => Service["mailu"]; + "/media/persistent/overrides/rspamd": + ensure => directory, + require => File["/media/persistent/overrides"]; + "/media/persistent/overrides/rspamd/milter_headers.conf": + source => "puppet:///modules/mail/milter_headers.conf", + require => File["/media/persistent/overrides/rspamd"], + notify => Service["mailu"]; } file { "/etc/systemd/system/mailu.service": |