Modified: puppet/modules/spamassassin/manifests/init.pp
===================================================================
--- puppet/modules/spamassassin/manifests/init.pp 2010-11-23 02:19:38 UTC (rev 415)
+++ puppet/modules/spamassassin/manifests/init.pp 2010-11-23 02:19:39 UTC (rev 416)
@@ -1,6 +1,11 @@
class spamassassin {
- package { "spamassassin", "spamassassin-sa-compile":
+ package { "spamassassin-sa-compile":
+ ensure => installed,
+ notify => "sa-compile",
+ }
+
+ package { "spamassassin":
ensure => installed,
}
@@ -12,4 +17,8 @@
requires => Package["spamassassin"],
content => template('spamassassin/local.cf')
}
+
+ exec { "sa-compile":
+ refreshonly => true,
+ }
}
Modified: puppet/modules/spamassassin/templates/local.cf
===================================================================
--- puppet/modules/spamassassin/templates/local.cf 2010-11-23 02:19:38 UTC (rev 415)
+++ puppet/modules/spamassassin/templates/local.cf 2010-11-23 02:19:39 UTC (rev 416)
@@ -90,3 +90,6 @@
auto_whitelist_path /var/spool/spamassassin/auto-whitelist
auto_whitelist_file_mode 0666
endif # Mail::SpamAssassin::Plugin::AWL
+
+loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+