Faidon Liambotis has submitted this change and it was merged.
Change subject: mail: add spamassassin to role::mail::mx
......................................................................
mail: add spamassassin to role::mail::mx
Doh!
Change-Id: If76c131ef988154f5cab2b2fffad047e6a10d761
---
M manifests/role/mail.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 0ba7271..6a6e17c 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -13,6 +13,13 @@
recipient => '[email protected]',
}
+ class { 'spamassassin':
+ required_score => '4.0',
+ use_bayes => '1',
+ bayes_auto_learn => '1',
+ trusted_networks => $network::constants::all_networks,
+ }
+
class { 'exim::roled':
local_domains => [
'+system_domains',
@@ -23,8 +30,11 @@
enable_mail_submission => false,
enable_external_mail => true,
mediawiki_relay => true,
+ enable_spamassassin => true,
}
+ Class['spamassassin'] -> Class['exim::roled']
+
monitor_service { 'smtp':
description => 'Exim SMTP',
check_command => 'check_smtp',
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index f463635..101a6fe 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -267,13 +267,12 @@
discard log_message = spam detected ($spam_score)
condition = ${if >{$spam_score_int}{120}{1}{0}}
<% else -%>
- # Let's trust local senders (Mailman) to not send out spam
+ # Let's trust local senders to not send out spam
accept hosts = +wikimedia_nets
set acl_m0 = trusted relay
# Only run through SpamAssassin if requested for this domain and
- # the message is not too large (Mailman's default moderation
- # threshold of 40 KB)
+ # the message is not too large
accept condition = ${if >{$message_size}{400K}}
# Skip if so requested
--
To view, visit https://gerrit.wikimedia.org/r/141413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If76c131ef988154f5cab2b2fffad047e6a10d761
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
