Skip to content

Support EL9 #85

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
treydock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support EL9 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,24 @@
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"7",
"8"
"8",
"9"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
"8"
"8",
"9"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"7",
"8"
"8",
"9"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ class { 'clamav':

context 'clamd' do
# set params
if fact('osfamily') == 'RedHat'
if fact('os.family') == 'RedHat'
service_name = 'clamd'
clamd_name = 'clamd'
end

if fact('osfamily') == 'Debian'
if fact('os.family') == 'Debian'
service_name = 'clamav-daemon'
clamd_name = 'clamav-daemon'
end
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/clamav_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

context 'with defaults' do
it { is_expected.to compile.with_all_deps }
if facts[:osfamily] == 'RedHat'
if facts[:os]['family'] == 'RedHat'
it { is_expected.to contain_class('epel') }
elsif facts[:osfamily] == 'Debian'
elsif facts[:os]['family'] == 'Debian'
it { is_expected.not_to contain_class('epel') }
end
it { is_expected.not_to contain_class('clamav::user') }
Expand Down Expand Up @@ -40,7 +40,7 @@
end

context 'manage manage_clamav_milter' do
if facts[:osfamily] == 'RedHat' && facts[:operatingsystemrelease] >= '7.0'
if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['full'] >= '7.0'
let(:params) { { manage_clamav_milter: true } }

it { is_expected.to contain_class('clamav::clamav_milter') }
Expand Down Expand Up @@ -82,15 +82,15 @@
let(:params) { { manage_freshclam: true } }

context 'with defaults' do
if facts[:osfamily] == 'RedHat'
if facts[:operatingsystemmajrelease].to_i == 6
if facts[:os]['family'] == 'RedHat'
if facts[:os]['release']['major'].to_i == 6
it 'is valid when there is no freshclam package' do
is_expected.not_to contain_package('freshclam')
end
it 'is valid when there no file freshclam_sysconfig' do
is_expected.not_to contain_file('freshclam_sysconfig')
end
elsif facts[:operatingsystemmajrelease].to_i == 7
elsif facts[:os]['release']['major'].to_i == 7
it 'is valid when there is freshclam package' do
is_expected.to contain_package('freshclam')
end
Expand All @@ -104,7 +104,7 @@
it 'is valid when there is no freshclam service' do
is_expected.not_to contain_service('freshclam')
end
elsif facts[:osfamily] == 'Debian'
elsif facts[:os]['family'] == 'Debian'
it { is_expected.to contain_package('freshclam') }
it { is_expected.to contain_file('freshclam.conf') }
it { is_expected.to contain_service('freshclam') }
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
copy_module_to(host, source: proj_root, module_name: 'clamav')
on host, puppet('module', 'install', 'puppetlabs-stdlib'), acceptable_exit_codes: [0, 1]

if fact('osfamily') == 'RedHat'
if fact('os.family') == 'RedHat'
on host, puppet('module', 'install', 'puppet-epel'), acceptable_exit_codes: [0, 1]
end
end
Expand Down