Skip to content

Commit 8cd5bc2

Browse files
authored
Merge pull request edestecd#70 from flinkflonk/master
PR for issue edestecd#69 - compatibility with RHEL/Centos 8.x
2 parents 51fdd46 + 2eb84a8 commit 8cd5bc2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

manifests/freshclam.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
$service_subscribe = File['freshclam.conf']
4545
}
4646

47-
# NOTE: RedHat comes with /etc/cron.daily/freshclam instead of a service
47+
# NOTE: RedHat <8 comes with /etc/cron.daily/freshclam instead of a service
4848
if $clamav::freshclam_service {
4949
service { 'freshclam':
5050
ensure => $clamav::freshclam_service_ensure,

manifests/params.pp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
$manage_repo = true
2424
$clamav_package = 'clamav'
2525
$clamav_version = 'installed'
26-
$freshclam_service = undef
2726

2827
if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
2928
# ### user vars ####
@@ -58,6 +57,13 @@
5857
$freshclam_sysconfig = '/etc/sysconfig/freshclam'
5958
$freshclam_delay = undef
6059

60+
# ### RHEL8/Centos8 actually do have a service
61+
if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
62+
$freshclam_service = 'clamav-freshclam'
63+
} else {
64+
$freshclam_service = undef
65+
}
66+
6167
# ### clamav_milter vars ####
6268
$clamav_milter_package = 'clamav-milter-systemd'
6369
$clamav_milter_version = 'installed'

0 commit comments

Comments
 (0)