Enable AWL checks for spamassassin

diff --git a/files/spamassassin/awl.pre b/files/spamassassin/awl.pre
new file mode 100644 (file)
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 269bf3a03cc8068cc89b211f2545f692b53cf891..12d1e19afa87d978c152af6f7d2dfc2aabb2cc28 100644 (file)
--- 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'],
+  }
 }