Skip to content

Completed OS support for clamav-milter #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ubellavance wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Completed OS support for clamav-milter #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
242fbb3
Completed OS support for clamav-milter
ubellavance Aug 21, 2017
96f5d15
Fixed indent linting
ubellavance Aug 30, 2017
f3cc569
Fixed booleans lint errors
ubellavance Aug 30, 2017
1fb1ffd
Update README.md
ubellavance Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,4 @@ No plans to support other versions (unless you add it :)..

## Development

Pull Requests welcome
Pull Requests are welcome
4 changes: 0 additions & 4 deletions manifests/clamav_milter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
59 changes: 47 additions & 12 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ####
Expand Down Expand Up @@ -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'
Expand Down