diff --git a/README.md b/README.md index 5910c69..caa3878 100644 --- a/README.md +++ b/README.md @@ -175,4 +175,4 @@ No plans to support other versions (unless you add it :).. ## Development -Pull Requests welcome +Pull Requests are welcome diff --git a/manifests/clamav_milter.pp b/manifests/clamav_milter.pp index c47eebe..ed9f82d 100644 --- a/manifests/clamav_milter.pp +++ b/manifests/clamav_milter.pp @@ -4,10 +4,6 @@ class clamav::clamav_milter { - unless ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemrelease, '7.0') >= 0) { - fail("OS family ${::osfamily}-${::operatingsystemrelease} is not supported. Only RedHat >= 7 is suppported.") - } - $config_options = $clamav::_clamav_milter_options package { 'clamav_milter': diff --git a/manifests/params.pp b/manifests/params.pp index a23cf4d..238720e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -106,12 +106,18 @@ $freshclam_delay = undef #### clamav_milter vars #### - $clamav_milter_package = undef - $clamav_milter_version = undef - $clamav_milter_config = undef - $clamav_milter_service = undef - $clamav_milter_options = undef - $clamav_milter_default_options = undef + $clamav_milter_package = 'clamav-milter' + $clamav_milter_version = 'installed' + $clamav_milter_config = '/etc/clamav-milter.conf' + $clamav_milter_service = 'clamav-milter' + $clamav_milter_options = {} + $clamav_milter_default_options = { + 'User' => 'clam', + 'AllowSupplementaryGroups' => 'yes', + 'MilterSocket' => '/var/run/clamav/clamav-milter.sock', + 'ClamdSocket' => 'tcp:127.0.0.1', + 'LogSyslog' => 'yes', + } } #### Default values OS specific #### @@ -157,12 +163,41 @@ $freshclam_delay = undef #### clamav_milter vars #### - $clamav_milter_package = undef - $clamav_milter_version = undef - $clamav_milter_config = undef - $clamav_milter_service = undef - $clamav_milter_options = undef - $clamav_milter_default_options = undef + $clamav_milter_package = 'clamav-milter' + $clamav_milter_version = 'installed' + $clamav_milter_config = '/etc/clamav/clamav-milter.conf' + $clamav_milter_service = 'clamav-milter' + $clamav_milter_options = {} + $clamav_milter_default_options = { + # Taken from the file provided by the Ubuntu 14.04 and 16.04 package + 'MilterSocket' => '/var/run/clamav/clamav-milter.ctl', + 'FixStaleSocket' => true, + 'User' => 'clamav', + 'AllowSupplementaryGroups' => 'yes', + 'ReadTimeout' => '120', + 'Foreground' => false, + 'PidFile' => '/var/run/clamav/clamav-milter.pid', + 'ClamdSocket' => 'unix:/var/run/clamav/clamd.ctl', + 'OnClean' => 'accept', + 'OnInfected' => 'Quarantine', + 'OnFail' => 'Defer', + 'AddHeader' => 'Replace', + 'LogSyslog' => false, + 'LogFacility' => 'LOG_LOCAL6', + 'LogVerbose' => false, + 'LogInfected' => 'Off', + 'LogClean' => 'Off', + 'LogRotate' => true, + 'MaxFileSize' => '25M', + 'SupportMultipleRecipients' => false, + 'TemporaryDirectory' => '/tmp', + 'LogFile' => '/var/log/clamav/clamav-milter.log', + 'LogTime' => true, + 'LogFileUnlock' => false, + 'LogFileMaxSize' => '0M', + 'MilterSocketGroup' => 'clamav', + 'MilterSocketMode' => '666', + } #### Default values OS specific #### $clamd_default_databasedirectory = '/var/lib/clamav'