From 59b471c16c89d499278ffbc886c478caf31af49f Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 24 Feb 2016 15:05:11 +0200 Subject: [PATCH] spamassassin: Fixed ClamAV module for CentOS/RHEL 7. --- spamassassin/manifests/init.pp | 2 +- spamassassin/{files/clamav.cf => templates/clamav.cf.erb} | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename spamassassin/{files/clamav.cf => templates/clamav.cf.erb} (68%) diff --git a/spamassassin/manifests/init.pp b/spamassassin/manifests/init.pp index 469409b..c14e5bf 100644 --- a/spamassassin/manifests/init.pp +++ b/spamassassin/manifests/init.pp @@ -130,7 +130,7 @@ class spamassassin::plugin::clamav { file { "/etc/mail/spamassassin/clamav.cf": ensure => present, - source => "puppet:///modules/spamassassin/clamav.cf", + content => template("spamassassin/clamav.cf.erb"), mode => "0644", owner => "root", group => $::operatingsystem ? { diff --git a/spamassassin/files/clamav.cf b/spamassassin/templates/clamav.cf.erb similarity index 68% rename from spamassassin/files/clamav.cf rename to spamassassin/templates/clamav.cf.erb index 1c7c06d..e02ad91 100644 --- a/spamassassin/files/clamav.cf +++ b/spamassassin/templates/clamav.cf.erb @@ -4,3 +4,5 @@ full CLAMAV eval:check_clamav() score CLAMAV 5 add_header all Virus _CLAMAV_ + +clamav_socket <%= scope.lookupvar('clamav::daemon::socket') %>