aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-23 02:19:39 +0000
committerMichael Scherer <misc@mageia.org>2010-11-23 02:19:39 +0000
commit89aa126e431a68e5edbe3fa2e81718796b664301 (patch)
tree03d376dd6d94ed7367ea38c070056803773dacc8
parent402b3ce3bbd8729b56ae478e3cf3e1362f85a617 (diff)
downloadpuppet-89aa126e431a68e5edbe3fa2e81718796b664301.tar
puppet-89aa126e431a68e5edbe3fa2e81718796b664301.tar.gz
puppet-89aa126e431a68e5edbe3fa2e81718796b664301.tar.bz2
puppet-89aa126e431a68e5edbe3fa2e81718796b664301.tar.xz
puppet-89aa126e431a68e5edbe3fa2e81718796b664301.zip
add filter compilation as this can reduce the load on server
-rw-r--r--modules/spamassassin/manifests/init.pp11
-rw-r--r--modules/spamassassin/templates/local.cf3
2 files changed, 13 insertions, 1 deletions
diff --git a/modules/spamassassin/manifests/init.pp b/modules/spamassassin/manifests/init.pp
index 7562349c..6ccbeba2 100644
--- a/modules/spamassassin/manifests/init.pp
+++ b/modules/spamassassin/manifests/init.pp
@@ -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 @@ class spamassassin {
requires => Package["spamassassin"],
content => template('spamassassin/local.cf')
}
+
+ exec { "sa-compile":
+ refreshonly => true,
+ }
}
diff --git a/modules/spamassassin/templates/local.cf b/modules/spamassassin/templates/local.cf
index edc6a0ea..0862cb87 100644
--- a/modules/spamassassin/templates/local.cf
+++ b/modules/spamassassin/templates/local.cf
@@ -90,3 +90,6 @@ ifplugin Mail::SpamAssassin::Plugin::AWL
auto_whitelist_path /var/spool/spamassassin/auto-whitelist
auto_whitelist_file_mode 0666
endif # Mail::SpamAssassin::Plugin::AWL
+
+loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+