summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-12-24 13:47:51 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-12-24 13:47:51 -0200
commite90b5b150e9ef8cd9dd8f2c104c8a7b18f746034 (patch)
tree94dabd02e3d4715ac5af8b6f11f9f98a2ba0bfc2
parent0a66e40f2f1ce012f9b3101c63423852175365a0 (diff)
downloadpuppet-mail-e90b5b150e9ef8cd9dd8f2c104c8a7b18f746034.tar.gz
puppet-mail-e90b5b150e9ef8cd9dd8f2c104c8a7b18f746034.tar.bz2
Enable AWL checks for spamassassin
-rw-r--r--files/spamassassin/awl.pre8
-rw-r--r--manifests/spamassassin.pp9
2 files changed, 17 insertions, 0 deletions
diff --git a/files/spamassassin/awl.pre b/files/spamassassin/awl.pre
new file mode 100644
index 0000000..7a4e0fa
--- /dev/null
+++ b/files/spamassassin/awl.pre
@@ -0,0 +1,8 @@
+# Managed by puppet. Avoids the following message:
+#
+# /etc/cron.daily/spamassassin:
+# config: warning: description exists for non-existent rule AWL
+#
+# AWL - do auto-whitelist checks
+#
+loadplugin Mail::SpamAssassin::Plugin::AWL
diff --git a/manifests/spamassassin.pp b/manifests/spamassassin.pp
index 269bf3a..12d1e19 100644
--- a/manifests/spamassassin.pp
+++ b/manifests/spamassassin.pp
@@ -14,4 +14,13 @@ class mail::spamassassin {
pattern => "spamd",
require => File['/etc/default/spamassassin'],
}
+
+ file { '/etc/spamassassin/awl.pre':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0644,
+ source => "puppet:///modules/mail/spamassassin/awl.pre",
+ require => Package['spamassassin'],
+ }
}